RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/mov: fix setting dependent disposition on ambisonic IAMF streams 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-03-05 13:23:52 -03:00
parent 3635c1ee97
commit 1a34eb3ffc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mov.c
View File

@ -926,6 +926,7 @@ static int mov_read_iacb(MOVContext *c, AVIOContext *pb, MOVAtom atom)
for (int i = 0; i < iamf->nb_audio_elements; i++) { for (int i = 0; i < iamf->nb_audio_elements; i++) {
IAMFAudioElement *audio_element = iamf->audio_elements[i]; IAMFAudioElement *audio_element = iamf->audio_elements[i];
const AVIAMFAudioElement *element;
AVStreamGroup *stg = AVStreamGroup *stg =
avformat_stream_group_create(c->fc, AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT, NULL); avformat_stream_group_create(c->fc, AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT, NULL);
@ -937,7 +938,7 @@ static int mov_read_iacb(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_iamf_audio_element_free(&stg->params.iamf_audio_element); av_iamf_audio_element_free(&stg->params.iamf_audio_element);
stg->id = audio_element->audio_element_id; stg->id = audio_element->audio_element_id;
/* Transfer ownership */ /* Transfer ownership */
stg->params.iamf_audio_element = audio_element->element; element = stg->params.iamf_audio_element = audio_element->element;
audio_element->element = NULL; audio_element->element = NULL;
for (int j = 0; j < audio_element->nb_substreams; j++) { for (int j = 0; j < audio_element->nb_substreams; j++) {
@ -964,6 +965,8 @@ static int mov_read_iacb(MOVContext *c, AVIOContext *pb, MOVAtom atom)
sc->refcount++; sc->refcount++;
} }
if (element->audio_element_type == AV_IAMF_AUDIO_ELEMENT_TYPE_SCENE)
stream->disposition |= AV_DISPOSITION_DEPENDENT;
if (i || j) { if (i || j) {
stream->disposition |= AV_DISPOSITION_DEPENDENT; stream->disposition |= AV_DISPOSITION_DEPENDENT;
if (audio_element->layers[0].substream_count == 1) if (audio_element->layers[0].substream_count == 1)

4
tests/ref/fate/mov-mp4-iamf-ambisonic_1
View File

@ -109,7 +109,7 @@ DISPOSITION:non_diegetic=0
DISPOSITION:captions=0 DISPOSITION:captions=0
DISPOSITION:descriptions=0 DISPOSITION:descriptions=0
DISPOSITION:metadata=0 DISPOSITION:metadata=0
DISPOSITION:dependent=0 DISPOSITION:dependent=1
DISPOSITION:still_image=0 DISPOSITION:still_image=0
[/STREAM] [/STREAM]
[STREAM] [STREAM]
@ -224,7 +224,7 @@ DISPOSITION:non_diegetic=0
DISPOSITION:captions=0 DISPOSITION:captions=0
DISPOSITION:descriptions=0 DISPOSITION:descriptions=0
DISPOSITION:metadata=0 DISPOSITION:metadata=0
DISPOSITION:dependent=0 DISPOSITION:dependent=1
DISPOSITION:still_image=0 DISPOSITION:still_image=0
[/STREAM] [/STREAM]
[STREAM] [STREAM]