Skip to content

Commit 57671ad

Browse files
Update memory numbers in DS
Significance: ------------- - Updated number of USAC elements calculation based on profile level - Updated memory requirements numbers in DS - Some more code clean-ups Tests: ------ - Smoke tests and conformance tests on Linux and MSVS builds
1 parent a713689 commit 57671ad

File tree

3 files changed

+9
-25
lines changed

3 files changed

+9
-25
lines changed

decoder/ia_core_coder_decode_main.c

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2577,7 +2577,7 @@ IA_ERRORCODE ia_core_coder_dec_main(VOID *temp_handle, WORD8 *inbuffer, WORD8 *o
25772577
WORD32 preroll_counter = 0;
25782578
WORD32 suitable_tracks = 1;
25792579
WORD32 num_samples_out;
2580-
WORD32 grp, channel, s, sig, cnt, elemIdx;
2580+
WORD32 grp, channel, s, sig, elemIdx;
25812581
WORD32 mhas_offset = 0;
25822582
WORD32 target_loudness;
25832583
WORD32 loudness_norm_flag;
@@ -3106,32 +3106,12 @@ IA_ERRORCODE ia_core_coder_dec_main(VOID *temp_handle, WORD8 *inbuffer, WORD8 *o
31063106
ia_core_coder_samples_sat((WORD8 *)outbuffer + tot_out_bytes, num_samples_out, pcmsize,
31073107
&pstr_dec_data->ptr_binaural_output[0], out_ch_map,
31083108
&mpegh_dec_handle->delay_in_samples, out_bytes, *num_channel_out);
3109-
{
3110-
WORD32 payload_buffer_offeset = 0;
3111-
WORD32 copy_bytes =
3112-
pstr_dec_data->str_frame_data.str_audio_specific_config.str_usac_config
3113-
.str_usac_dec_config.usac_ext_gain_payload_len[preroll_counter] *
3114-
sizeof(WORD8);
3115-
3116-
pstr_asc->str_usac_config.str_usac_dec_config.usac_ext_gain_payload_len[preroll_counter] =
3117-
pstr_dec_data->str_frame_data.str_audio_specific_config.str_usac_config
3118-
.str_usac_dec_config.usac_ext_gain_payload_len[preroll_counter];
3119-
3120-
for (cnt = 0; cnt < preroll_counter; cnt++)
3121-
{
3122-
payload_buffer_offeset +=
3123-
pstr_dec_data->str_frame_data.str_audio_specific_config.str_usac_config
3124-
.str_usac_dec_config.usac_ext_gain_payload_len[cnt] *
3125-
sizeof(WORD8);
3126-
}
3127-
3128-
pstr_asc->str_usac_config.str_usac_dec_config.preroll_bytes[preroll_counter] = *out_bytes;
3109+
pstr_asc->str_usac_config.str_usac_dec_config.preroll_bytes[preroll_counter] = *out_bytes;
31293110

3130-
preroll_counter++;
3111+
preroll_counter++;
31313112

3132-
if (preroll_counter > (MAX_AUDIO_PREROLLS + 1))
3133-
return IA_MPEGH_DEC_EXE_FATAL_UNSUPPORTED_NUM_PRE_ROLLS;
3134-
}
3113+
if (preroll_counter > (MAX_AUDIO_PREROLLS + 1))
3114+
return IA_MPEGH_DEC_EXE_FATAL_UNSUPPORTED_NUM_PRE_ROLLS;
31353115

31363116
access_units++;
31373117
preroll_units--;

decoder/ia_core_coder_definitions.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@
4949

5050
#define MAX_PREROLL_FRAMES (1)
5151
#define MAX_OUTPUT_PCM_SIZE (4)
52+
#ifdef LC_LEVEL_4
5253
#define MAX_USAC_CH (56)
54+
#else
55+
#define MAX_USAC_CH (32)
56+
#endif
5357
#define MAX_LOUD_SPEAKERS (24)
5458
#define MAX_OUT_SAMPLES_PER_FRAME (1024)
5559
#define MAX_USAC_ELEMENTS ((MAX_USAC_CH << 1) + (MAX_USAC_CH >> 1))

docs/IA-MPEG-H-3D-Audio-Dec-DS.doc

1.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)