---
libavformat/mov.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 39e6883..ae6e8f8 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -574,12 +574,16 @@ static int mov_read_esds(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
static int mov_read_dac3(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{
AVStream *st;
+ enum AVAudioServiceType *ast;
int ac3info, acmod, lfeon, bsmod;
if (c->fc->nb_streams < 1)
return 0;
st = c->fc->streams[c->fc->nb_streams-1];
+ ast = (enum AVAudioServiceType*)ff_stream_new_side_data(st,
AV_PKT_DATA_AUDIO_SERVICE_TYPE,
+ sizeof(*ast));
+
ac3info = avio_rb24(pb);
bsmod = (ac3info >> 14) & 0x7;
acmod = (ac3info >> 11) & 0x7;
@@ -588,9 +592,11 @@ static int mov_read_dac3(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
st->codec->channel_layout = avpriv_ac3_channel_layout_tab[acmod];
if (lfeon)
st->codec->channel_layout |= AV_CH_LOW_FREQUENCY;
- st->codec->audio_service_type = bsmod;
+ *ast = bsmod;
if (st->codec->channels > 1 && bsmod == 0x7)
- st->codec->audio_service_type = AV_AUDIO_SERVICE_TYPE_KARAOKE;
+ *ast = AV_AUDIO_SERVICE_TYPE_KARAOKE;
+
+ st->codec->audio_service_type = *ast;
return 0;
}
@@ -598,12 +604,18 @@ static int mov_read_dac3(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
static int mov_read_dec3(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{
AVStream *st;
+ enum AVAudioServiceType *ast;
int eac3info, acmod, lfeon, bsmod;
if (c->fc->nb_streams < 1)
return 0;
st = c->fc->streams[c->fc->nb_streams-1];
+ ast = (enum AVAudioServiceType*)ff_stream_new_side_data(st,
AV_PKT_DATA_AUDIO_SERVICE_TYPE,
+ sizeof(*ast));
+ if (!ast)
+ return AVERROR(ENOMEM);
+
/* No need to parse fields for additional independent substreams and its
* associated dependent substreams since libavcodec's E-AC-3 decoder
* does not support them yet. */
@@ -616,9 +628,11 @@ static int mov_read_dec3(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
if (lfeon)
st->codec->channel_layout |= AV_CH_LOW_FREQUENCY;
st->codec->channels =
av_get_channel_layout_nb_channels(st->codec->channel_layout);
- st->codec->audio_service_type = bsmod;
+ *ast = bsmod;
if (st->codec->channels > 1 && bsmod == 0x7)
- st->codec->audio_service_type = AV_AUDIO_SERVICE_TYPE_KARAOKE;
+ *ast = AV_AUDIO_SERVICE_TYPE_KARAOKE;
+
+ st->codec->audio_service_type = *ast;
return 0;
}
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
