Skip to content

fix element_gain_offset_size parsing and refine return value #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yilun-zhangs merged 2 commits into from
Jul 16, 2026
Merged

fix element_gain_offset_size parsing and refine return value #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e34cb5c
fix element_gain_offset_size parsing
yilun-zhangs Jul 16, 2026
46c9508
propagate real return value
yilun-zhangs Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 71 additions & 56 deletions code/src/iamf_dec/obu/mix_presentation_obu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,13 @@ static int _obu_mp_rendering_config_init(obu_rendering_config_t *config,
config->flags |= def_rendering_config_flag_element_gain_offset;
config->binaural_filter_profile = val >> 3 & 0x03;
config->rendering_config_extension_size = ior_leb128_u32(r);

info("%s: headphones rendering mode(%u), binaural filter profile(%u)",
def_mp_str, config->headphones_rendering_mode,
config->binaural_filter_profile);
info("%s: rendering config extension size(%u)", def_mp_str,
config->rendering_config_extension_size);

if (config->rendering_config_extension_size > 0) {
uint32_t pos = ioc_tell(ior);
uint32_t num_parameters = ior_leb128_u32(r);
Expand Down Expand Up @@ -332,71 +339,74 @@ static int _obu_mp_rendering_config_init(obu_rendering_config_t *config,
} else {
uint32_t rendering_config_params_extension_size = ior_leb128_u32(r);
ior_skip(r, rendering_config_params_extension_size);
info("%s: rendering config params extension size(%u)", def_mp_str,
rendering_config_params_extension_size);
}
}
}
}
if (config->flags & def_rendering_config_flag_element_gain_offset) {
config->element_gain_offset_type = ior_8(r);
if (config->element_gain_offset_type ==
ck_element_gain_offset_type_value) {
config->element_gain_offset.value = (int16_t)ior_b16(r);

debug("encoded element gain offset value 0x%04x",
config->element_gain_offset.value);

config->element_gain_offset_db.value =
config->element_gain_offset_db.min =
config->element_gain_offset_db.max =
iamf_gain_q78_to_db(config->element_gain_offset.value);

info("element gain offset value %f dB",
config->element_gain_offset_db.value);
} else if (config->element_gain_offset_type ==
ck_element_gain_offset_type_range) {
float min, max;
config->element_gain_offset.value = (int16_t)ior_b16(r);
config->element_gain_offset.min = (int16_t)ior_b16(r);
config->element_gain_offset.max = (int16_t)ior_b16(r);

debug(
"encoded element gain offset value 0x%04x, min 0x%04x, max 0x%04x",
def_lsb_16bits(config->element_gain_offset.value),
def_lsb_16bits(config->element_gain_offset.min),
def_lsb_16bits(config->element_gain_offset.max));

min = iamf_gain_q78_to_db(config->element_gain_offset.min);
if (min > 0.f) min = 0.f;
max = iamf_gain_q78_to_db(config->element_gain_offset.max);
if (max < 0.f) max = 0.f;

config->element_gain_offset_db.value =
iamf_gain_q78_to_db(config->element_gain_offset.value);
config->element_gain_offset_db.min =
min + config->element_gain_offset_db.value;
config->element_gain_offset_db.max =
max + config->element_gain_offset_db.value;

info("element gain offset value %f dB, min %f dB, max %f dB",
config->element_gain_offset_db.value,
config->element_gain_offset_db.min,
config->element_gain_offset_db.max);
} else {
config->rendering_config_extension_size = ior_leb128_u32(r);
ior_skip(r, config->rendering_config_extension_size);

if (ret == IAMF_OK) {
if (config->flags & def_rendering_config_flag_element_gain_offset) {
config->element_gain_offset_type = ior_8(r);
if (config->element_gain_offset_type ==
ck_element_gain_offset_type_value) {
config->element_gain_offset.value = (int16_t)ior_b16(r);

debug("encoded element gain offset value 0x%04x",
config->element_gain_offset.value);

config->element_gain_offset_db.value =
config->element_gain_offset_db.min =
config->element_gain_offset_db.max =
iamf_gain_q78_to_db(config->element_gain_offset.value);

info("element gain offset value %f dB",
config->element_gain_offset_db.value);
} else if (config->element_gain_offset_type ==
ck_element_gain_offset_type_range) {
float min, max;
config->element_gain_offset.value = (int16_t)ior_b16(r);
config->element_gain_offset.min = (int16_t)ior_b16(r);
config->element_gain_offset.max = (int16_t)ior_b16(r);

debug(
"encoded element gain offset value 0x%04x, min 0x%04x, max "
"0x%04x",
def_lsb_16bits(config->element_gain_offset.value),
def_lsb_16bits(config->element_gain_offset.min),
def_lsb_16bits(config->element_gain_offset.max));

min = iamf_gain_q78_to_db(config->element_gain_offset.min);
if (min > 0.f) min = 0.f;
max = iamf_gain_q78_to_db(config->element_gain_offset.max);
if (max < 0.f) max = 0.f;

config->element_gain_offset_db.value =
iamf_gain_q78_to_db(config->element_gain_offset.value);
config->element_gain_offset_db.min =
min + config->element_gain_offset_db.value;
config->element_gain_offset_db.max =
max + config->element_gain_offset_db.value;

info("element gain offset value %f dB, min %f dB, max %f dB",
config->element_gain_offset_db.value,
config->element_gain_offset_db.min,
config->element_gain_offset_db.max);
} else {
config->element_gain_offset_size = ior_leb128_u32(r);
ior_skip(r, config->element_gain_offset_size);
info("%s: element gain offset size(%u)", def_mp_str,
config->element_gain_offset_size);
}
}
}

ior_skip(r,
config->rendering_config_extension_size - (ioc_tell(ior) - pos));
}

info("%s: headphones rendering mode(%u), binaural filter profile(%u)",
def_mp_str, config->headphones_rendering_mode,
config->binaural_filter_profile);
info("%s: skip extension size(%u)", def_mp_str,
config->rendering_config_extension_size);

return IAMF_OK;
return ret;
}

static void _obu_mp_audio_element_config_free(
Expand Down Expand Up @@ -442,7 +452,12 @@ static obu_audio_element_config_t *_obu_mp_audio_element_config_new(
}
}

_obu_mp_rendering_config_init(&config->rendering_config, r);
if (_obu_mp_rendering_config_init(&config->rendering_config, r) != IAMF_OK) {
error("fail to rendering config init.");
_obu_mp_audio_element_config_free(config);
return 0;
}

info("%s: element mix gain:", def_mp_str);
mix_gain_parameter_base_init(&config->element_mix_gain, r);

Expand Down
1 change: 1 addition & 0 deletions code/src/iamf_dec/obu/mix_presentation_obu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ typedef struct RenderingConfig {
float min;
float max;
} element_gain_offset_db;
uint32_t element_gain_offset_size;

uint32_t rendering_config_extension_size;
} obu_rendering_config_t;
Expand Down
Loading