virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

fftools/ffmpeg_mux_init: add missing IAMF Param Definition copies

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-04-24 17:31:45 -03:00
parent f684228407
commit 8c27cdd2d4
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fftools/ffmpeg_mux_init.c
View File

@ -2257,6 +2257,15 @@ static int of_serialize_options(Muxer *mux, void *obj, AVBPrint *bp)
return ret; \ return ret; \
} while (0) } while (0)
#define SERIALIZE_LOOP_SUBBLOCK(obj) do { \
for (int k = 0; k < obj->nb_subblocks; k++) { \
ret = of_serialize_options(mux, \
av_iamf_param_definition_get_subblock(obj, k), bp); \
if (ret < 0) \
return ret; \
} \
} while (0)
#define SERIALIZE_LOOP(parent, child, suffix, separator) do { \ #define SERIALIZE_LOOP(parent, child, suffix, separator) do { \
for (int j = 0; j < parent->nb_## child ## suffix; j++) { \ for (int j = 0; j < parent->nb_## child ## suffix; j++) { \
av_bprintf(bp, separator#child "="); \ av_bprintf(bp, separator#child "="); \
@ -2309,12 +2318,20 @@ static int of_map_group(Muxer *mux, AVDictionary **dict, AVBPrint *bp, const cha
AVIAMFAudioElement *audio_element = stg->params.iamf_audio_element; AVIAMFAudioElement *audio_element = stg->params.iamf_audio_element;
if (audio_element->demixing_info) { if (audio_element->demixing_info) {
AVIAMFParamDefinition *demixing_info = audio_element->demixing_info;
av_bprintf(bp, ",demixing="); av_bprintf(bp, ",demixing=");
SERIALIZE(audio_element, demixing_info); SERIALIZE(audio_element, demixing_info);
if (ret && demixing_info->nb_subblocks)
av_bprintf(bp, ":");
SERIALIZE_LOOP_SUBBLOCK(demixing_info);
} }
if (audio_element->recon_gain_info) { if (audio_element->recon_gain_info) {
AVIAMFParamDefinition *recon_gain_info = audio_element->recon_gain_info;
av_bprintf(bp, ",recon_gain="); av_bprintf(bp, ",recon_gain=");
SERIALIZE(audio_element, recon_gain_info); SERIALIZE(audio_element, recon_gain_info);
if (ret && recon_gain_info->nb_subblocks)
av_bprintf(bp, ":");
SERIALIZE_LOOP_SUBBLOCK(recon_gain_info);
} }
SERIALIZE_LOOP(audio_element, layer, s, ","); SERIALIZE_LOOP(audio_element, layer, s, ",");
break; break;
@ -2324,11 +2341,16 @@ static int of_map_group(Muxer *mux, AVDictionary **dict, AVBPrint *bp, const cha
for (int i = 0; i < mix->nb_submixes; i++) { for (int i = 0; i < mix->nb_submixes; i++) {
AVIAMFSubmix *submix = mix->submixes[i]; AVIAMFSubmix *submix = mix->submixes[i];
AVIAMFParamDefinition *output_mix_config = submix->output_mix_config;
av_bprintf(bp, ",submix="); av_bprintf(bp, ",submix=");
SERIALIZE(mix, submixes[i]); SERIALIZE(mix, submixes[i]);
if (ret && output_mix_config->nb_subblocks)
av_bprintf(bp, ":");
SERIALIZE_LOOP_SUBBLOCK(output_mix_config);
for (int j = 0; j < submix->nb_elements; j++) { for (int j = 0; j < submix->nb_elements; j++) {
AVIAMFSubmixElement *element = submix->elements[j]; AVIAMFSubmixElement *element = submix->elements[j];
AVIAMFParamDefinition *element_mix_config = element->element_mix_config;
int64_t id = get_stream_group_index_from_id(mux, element->audio_element_id); int64_t id = get_stream_group_index_from_id(mux, element->audio_element_id);
if (id < 0) { if (id < 0) {
@ -2339,6 +2361,9 @@ static int of_map_group(Muxer *mux, AVDictionary **dict, AVBPrint *bp, const cha
av_bprintf(bp, "|element="); av_bprintf(bp, "|element=");
SERIALIZE(submix, elements[j]); SERIALIZE(submix, elements[j]);
if (ret && element_mix_config->nb_subblocks)
av_bprintf(bp, ":");
SERIALIZE_LOOP_SUBBLOCK(element_mix_config);
if (ret) if (ret)
av_bprintf(bp, ":"); av_bprintf(bp, ":");
av_bprintf(bp, "stg=%"PRId64, id); av_bprintf(bp, "stg=%"PRId64, id);

2
tests/ref/fate/iamf-5_1-copy
View File

@ -155,7 +155,7 @@ duration=960
constant_subblock_duration=960 constant_subblock_duration=960
[PIECE] [PIECE]
subblock_duration=960 subblock_duration=960
dmixp_mode=0 dmixp_mode=1
[/PIECE] [/PIECE]
[/SUBCOMPONENT] [/SUBCOMPONENT]
[SUBCOMPONENT] [SUBCOMPONENT]