# HG changeset patch # User jbr # Date 1283809931 0 # Node ID b6e3e7876e4c6a074f7b79987c4073eb71b18f37 # Parent 4f3cb203b378f502d0bdee7f7ee9894545334b2b Read the number of channels from the 'dac3' tag for AC-3 in MP4. diff -r 4f3cb203b378 -r b6e3e7876e4c mov.c --- a/mov.c Mon Sep 06 17:51:44 2010 +0000 +++ b/mov.c Mon Sep 06 21:52:11 2010 +0000 @@ -559,6 +559,21 @@ return ff_mov_read_esds(c->fc, pb, atom); } +static int mov_read_dac3(MOVContext *c, ByteIOContext *pb, MOVAtom atom) +{ + AVStream *st; + int ac3info, acmod, lfeon; + + st = c->fc->streams[c->fc->nb_streams-1]; + + ac3info = get_be24(pb); + acmod = (ac3info >> 11) & 0x7; + lfeon = (ac3info >> 10) & 0x1; + st->codec->channels = ((int[]){2,1,2,3,3,4,4,5})[acmod] + lfeon; + + return 0; +} + static int mov_read_pasp(MOVContext *c, ByteIOContext *pb, MOVAtom atom) { const int num = get_be32(pb); @@ -2245,6 +2260,7 @@ { MKTAG('u','d','t','a'), mov_read_default }, { MKTAG('w','a','v','e'), mov_read_wave }, { MKTAG('e','s','d','s'), mov_read_esds }, +{ MKTAG('d','a','c','3'), mov_read_dac3 }, /* AC-3 info */ { MKTAG('w','i','d','e'), mov_read_wide }, /* place holder */ { MKTAG('c','m','o','v'), mov_read_cmov }, { 0, NULL }