Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 04:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support for FLAC in MS compatibility mode.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-11-16 19:18:22 +00:00
parent 2121a4e89d
commit 01f2111848
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/input/r_matroska.cpp
View File

@ -1382,20 +1382,32 @@ void kax_reader_c::create_packetizers() {
mxinfo("+-> Using the generic audio output module for stream "
"%u (CodecID: %s).\n", t->tnum, t->codec_id);
#if defined(HAVE_FLAC_FORMAT_H)
} else if (t->a_formattag == FOURCC('f', 'L', 'a', 'C')) {
} else if ((t->a_formattag == FOURCC('f', 'L', 'a', 'C')) ||
(t->a_formattag == 0xf1ac)) {
nti.private_data = NULL;
nti.private_size = 0;
if (t->a_formattag == FOURCC('f', 'L', 'a', 'C'))
t->packetizer =
new flac_packetizer_c(this, (int)t->a_sfreq, t->a_channels,
t->a_bps, (unsigned char *)t->private_data,
t->a_bps,
(unsigned char *)t->private_data,
t->private_size, &nti);
else
t->packetizer =
new flac_packetizer_c(this, (int)t->a_sfreq, t->a_channels,
t->a_bps,
((unsigned char *)t->private_data) +
sizeof(alWAVEFORMATEX),
t->private_size - sizeof(alWAVEFORMATEX),
&nti);
if (verbose)
mxinfo("+-> Using the FLAC output module for track ID %u.\n",
t->tnum);
#endif
} else
mxerror(PFX "Unsupported track type for track %d.\n", t->tnum);
mxerror(PFX "Unsupported audio track %s for track %d.\n",
t->codec_id, t->tnum);
if ((t->packetizer != NULL) && (t->a_osfreq != 0.0))
t->packetizer->set_audio_output_sampling_freq(t->a_osfreq);
@ -1427,8 +1439,7 @@ void kax_reader_c::create_packetizers() {
break;
default:
mxerror(PFX "Unsupported track type "
"for track %d.\n", t->tnum);
mxerror(PFX "Unsupported track type for track %d.\n", t->tnum);
break;
}
if (t->tuid != 0)