Commit 8895083f authored by advasila's avatar advasila
Browse files

fixes 24.4 TD case

parent 8087c2e8

lib_com/ivas_prot.h

+9 −0
Original line number Diff line number Diff line
@@ -1967,6 +1967,9 @@ void stereo_td_init_dec( 
void tdm_configure_dec(

#ifdef MASA_AND_OBJECTS

    const int16_t ivas_format,                                  /* i  : IVAS format                             */

#ifdef FIX_OMASA_24_4k

    const int16_t ism_mode,                                     /* i: ISM mode in combined format               */

#endif

#endif

    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */

    int16_t *tdm_ratio_idx,                                     /* o  : ratio index                             */
@@ -2019,6 +2022,9 @@ void tdm_ol_pitch_comparison( 
void tdm_configure_enc(

#ifdef MASA_AND_OBJECTS

    const int16_t ivas_format,                                  /* i  : IVAS format                             */

#ifdef FIX_OMASA_24_4k

    const int16_t ism_mode,                                     /* i: ISM mode in combined format               */

#endif

#endif

    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE encoder structure                   */

    const float Etot_last[CPE_CHANNELS],                        /* i/o: Energy of last frame                    */
@@ -2038,6 +2044,9 @@ ivas_error signaling_enc_secondary( 
void tdm_bit_alloc(

#ifdef MASA_AND_OBJECTS

    const int16_t ivas_format,                                  /* i  : IVAS format                             */

#ifdef FIX_OMASA_24_4k

    const int16_t ism_mode,                                     /* i: ISM mode in combined format               */

#endif

#endif

    const int32_t element_brate_wo_meta,                        /* i  : element bitrate without metadata        */

    const int16_t tdm_lp_reuse_flag,                            /* i  : LPC reusage flag                        */

lib_com/ivas_stereo_td_bit_alloc.c

+8 −1
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ 
void tdm_bit_alloc(

#ifdef MASA_AND_OBJECTS

    const int16_t ivas_format,           /* i  : IVAS format                         */

#ifdef FIX_OMASA_24_4k

    const int16_t ism_mode,              /* i: ISM mode in combined format           */

#endif

#endif

    const int32_t element_brate_wo_meta, /* i  : element bitrate without metadata    */

    const int16_t tdm_lp_reuse_flag,     /* i  : LPC reusage flag                    */
@@ -140,7 +143,11 @@ void tdm_bit_alloc( 


    /* secondary channel bitrate allocation based on the energy scaling ratio */

#ifdef MASA_AND_OBJECTS

#ifdef FIX_OMASA_24_4k

    if ( ( ( ivas_format != MASA_ISM_FORMAT || ism_mode == ISM_MODE_NONE ) && ( ( coder_type != UNVOICED ) || tdm_LRTD_flag == 1 ) ) || ( ivas_format == MASA_ISM_FORMAT && ism_mode != ISM_MODE_NONE && coder_type > UNVOICED ) )

#else

    if ( ( ivas_format != MASA_ISM_FORMAT && ( ( coder_type != UNVOICED ) || tdm_LRTD_flag == 1 ) ) || ( ivas_format == MASA_ISM_FORMAT && coder_type > UNVOICED ) )

#endif

#else

    if ( ( coder_type != UNVOICED ) || tdm_LRTD_flag == 1 )

#endif

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
#define FIX_OMASA_STEREO_SWITCHING                      /* VA: introduce  Unified/MDCT stereo switching for 3ISM @96 kbps and 4ISM @128 kbps */

#define FIX_OMASA_BRSW                                  /* Nokia + VA: Fix missing init of OMASA metadata delay buffers, brsw-related init fixes */

#define FIX_356_ISM_METADATA_SYNC_OMASA // temp. fix

#define FIX_OMASA_24_4k                                 /* Nokia: fix OMASA in TD mode at 24.4k */

#endif



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_cpe_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -439,6 +439,9 @@ ivas_error ivas_cpe_dec( 
            tdm_configure_dec(

#ifdef MASA_AND_OBJECTS

                st_ivas->ivas_format,

#ifdef FIX_OMASA_24_4k

                st_ivas->ism_mode,

#endif

#endif

                hCPE, &tdm_ratio_idx, nb_bits_metadata );

lib_dec/ivas_stereo_td_dec.c

+8 −1
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ void stereo_td_init_dec( 
void tdm_configure_dec(

#ifdef MASA_AND_OBJECTS

    const int16_t ivas_format, /* i  : IVAS format                     */

#ifdef FIX_OMASA_24_4k

    const int16_t ism_mode,    /* i  : ISM mode in combined format     */

#endif

#endif

    CPE_DEC_HANDLE hCPE,           /* i/o: CPE decoder structure           */

    int16_t *tdm_ratio_idx,        /* o  : ratio index                     */
@@ -308,7 +311,11 @@ void tdm_configure_dec( 
     *----------------------------------------------------------------*/



#ifdef MASA_AND_OBJECTS

    tdm_bit_alloc( ivas_format, hCPE->element_brate - nb_bits_metadata * FRAMES_PER_SEC + hCPE->brate_surplus,

    tdm_bit_alloc( ivas_format,

#ifdef FIX_OMASA_24_4k

                   ism_mode, 

#endif       

        hCPE->element_brate - nb_bits_metadata * FRAMES_PER_SEC + hCPE->brate_surplus,

                   hStereoTD->tdm_lp_reuse_flag, &( sts[0]->total_brate ), &( sts[1]->total_brate ),

                   &hStereoTD->tdm_low_rate_mode, sts[1]->coder_type, *tdm_ratio_idx, hStereoTD->tdm_Pitch_reuse_flag,

                   sts[0]->bwidth, sts[1]->bwidth, sts[0]->flag_ACELP16k, hStereoTD->tdm_LRTD_flag, mod_ct, tdm_inst_ratio_idx );