Commit 715dc056 authored by malenov's avatar malenov
Browse files

simplification of logic

parent 449a72c4

lib_enc/ivas_decision_matrix_enc.c

+11 −0
Original line number Diff line number Diff line
@@ -465,6 +465,16 @@ void ivas_signaling_enc( 


                if ( st->core == ACELP_CORE )

                {

#ifdef NONBE_FIX_1205_TD_STEREO_MOD_CT

                    /* write coder type */

                    push_indice( hBstr, IND_ACELP_SIGNALLING, st->coder_type, 3 );



                    if ( element_brate >= FRMT_SHP_MIN_BRATE_IVAS )

                    {

                        /* write sharpening flag */

                        push_indice( hBstr, IND_SHARP_FLAG, st->sharpFlag, 1 );

                    }

#else

                    if ( element_brate < FRMT_SHP_MIN_BRATE_IVAS )

                    {

                        push_indice( hBstr, IND_ACELP_SIGNALLING, st->coder_type, 3 );
@@ -477,6 +487,7 @@ void ivas_signaling_enc( 
                        /* write sharpening flag */

                        push_indice( hBstr, IND_SHARP_FLAG, st->sharpFlag, 1 );

                    }

#endif



                    /* write extension layer flag to distinguish between TBE (0) and BWE (1) */

                    if ( st->extl_brate > 0 )

lib_enc/ivas_stereo_td_enc.c

+0 −1
Original line number Diff line number Diff line
@@ -452,7 +452,6 @@ void tdm_configure_enc( 
#ifdef NONBE_FIX_1205_TD_STEREO_MOD_CT

    if ( hCPE->element_brate < IVAS_24k4 )

    {

        mod_ct = AUDIO;

        /* Only sure TRANSITION coding modes are important for bit allocation, otherwise mod_ct is set to AUDIO only to easy debugging if needed */

        if ( sts[0]->coder_type == TRANSITION ||

             ( ( ( sts[0]->last_L_frame >= L_FRAME16k && sts[0]->flag_ACELP16k == 0 ) || ( sts[0]->last_L_frame == L_FRAME && sts[0]->flag_ACELP16k == 1 ) ) && sts[0]->last_core_brate != FRAME_NO_DATA && sts[0]->last_core_brate != SID_2k40 && sts[0]->coder_type_raw != VOICED /*in case of CNG, this code is not reached sts[0]->core_brate != FRAME_NO_DATA && sts[0]->core_brate != SID_2k40 &&*/ ) )