Mercurial > mplayer.hg

comparison libmpdemux/demux_mkv.c @ 13804:5c0fda3b83c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DTS uses the format tag 0x2001. Patch by Joakim Plate (joakim ! plate () ecce ! se)
author mosu
date Sat, 30 Oct 2004 08:47:04 +0000
parents a5004eb92a79
children 4802041ab8e3
comparison
equal deleted inserted replaced
13803:0bd7ccf63c54 13804:5c0fda3b83c3
1688 { 1688 {
1689 memset(sh_a->wf, 0, sizeof (WAVEFORMATEX)); 1689 memset(sh_a->wf, 0, sizeof (WAVEFORMATEX));
1690 if (!strcmp(track->codec_id, MKV_A_MP3) || 1690 if (!strcmp(track->codec_id, MKV_A_MP3) ||
1691 !strcmp(track->codec_id, MKV_A_MP2)) 1691 !strcmp(track->codec_id, MKV_A_MP2))
1692 track->a_formattag = 0x0055; 1692 track->a_formattag = 0x0055;
1693 else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3)) || 1693 else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3)))
1694 !strcmp(track->codec_id, MKV_A_DTS))
1695 track->a_formattag = 0x2000; 1694 track->a_formattag = 0x2000;
1695 else if (!strcmp(track->codec_id, MKV_A_DTS))
1696 track->a_formattag = 0x2001;
1696 else if (!strcmp(track->codec_id, MKV_A_PCM) || 1697 else if (!strcmp(track->codec_id, MKV_A_PCM) ||
1697 !strcmp(track->codec_id, MKV_A_PCM_BE)) 1698 !strcmp(track->codec_id, MKV_A_PCM_BE))
1698 track->a_formattag = 0x0001; 1699 track->a_formattag = 0x0001;
1699 else if (!strcmp(track->codec_id, MKV_A_AAC_2MAIN) || 1700 else if (!strcmp(track->codec_id, MKV_A_AAC_2MAIN) ||
1700 !strncmp(track->codec_id, MKV_A_AAC_2LC, 1701 !strncmp(track->codec_id, MKV_A_AAC_2LC,
1808 if (track->a_formattag == 0x0055) /* MP3 || MP2 */ 1809 if (track->a_formattag == 0x0055) /* MP3 || MP2 */
1809 { 1810 {
1810 sh_a->wf->nAvgBytesPerSec = 16000; 1811 sh_a->wf->nAvgBytesPerSec = 16000;
1811 sh_a->wf->nBlockAlign = 1152; 1812 sh_a->wf->nBlockAlign = 1152;
1812 } 1813 }
1813 else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3))) 1814 else if ((track->a_formattag == 0x2000) || /* AC3 */
1815 (track->a_formattag == 0x2001)) /* DTS */
1814 { 1816 {
1815 sh_a->wf->nAvgBytesPerSec = 16000; 1817 sh_a->wf->nAvgBytesPerSec = 16000;
1816 sh_a->wf->nBlockAlign = 1536; 1818 sh_a->wf->nBlockAlign = 1536;
1817 } 1819 }
1818 else if (track->a_formattag == 0x0001) /* PCM || PCM_BE */ 1820 else if (track->a_formattag == 0x0001) /* PCM || PCM_BE */