Commit e9566543 authored by advasila's avatar advasila
Browse files

update for fix 874

parent c8552cca

lib_com/ivas_prot.h

+0 −4
Original line number Diff line number Diff line
@@ -1927,10 +1927,6 @@ int16_t select_stereo_mode( 
    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                           */

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

    const int32_t ivas_total_brate                              /* i  : IVAS total brate                                */

#if 1

    ,

    const int32_t cpe_brate                                     /* i   : bitrate for CPE in combined format             */

#endif

);



void stereo_classifier_init(

lib_dec/ivas_jbm_dec.c

+4 −6
Original line number Diff line number Diff line
@@ -200,12 +200,7 @@ ivas_error ivas_jbm_dec_tc( 
    {

        set_s( nb_bits_metadata, 0, MAX_SCE );



#ifdef NONBE_FIX_874_OMASA_BRSW_2TD

        if ( st_ivas->nCPE > 0 )

        {

            st_ivas->hCPE[0]->brate_surplus = 0;

        }

#endif



        /* read parameters from the bitstream */

        if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hQMetaData != NULL )

        {
@@ -231,6 +226,9 @@ ivas_error ivas_jbm_dec_tc( 


        if ( st_ivas->nchan_transport == CPE_CHANNELS && st_ivas->nCPE >= 1 )

        {

#ifdef NONBE_FIX_874_OMASA_BRSW_2TD

            st_ivas->hCPE[0]->brate_surplus = 0;

#endif

            st_ivas->hCPE[0]->element_brate = ivas_total_brate;

        }

lib_enc/ivas_cpe_enc.c

+0 −12
Original line number Diff line number Diff line
@@ -176,19 +176,7 @@ ivas_error ivas_cpe_enc( 


    if ( sts[0]->ini_frame > 0 && st_ivas->hMCT == NULL )

    {

#ifdef NONBE_FIX_874_OMASA_BRSW_2TD

        if ( ivas_format == MASA_ISM_FORMAT )

        {

            cpe_brate = calculate_cpe_brate_MASA_ISM( st_ivas->ism_mode, ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism );

        }

        else

        {

            cpe_brate = ivas_total_brate;

        }

        hCPE->element_mode = select_stereo_mode( hCPE, ivas_format, ivas_total_brate, cpe_brate );

#else

        hCPE->element_mode = select_stereo_mode( hCPE, ivas_format, ivas_total_brate );

#endif

    }



    stereo_mode_combined_format_enc( st_ivas, hCPE );

lib_enc/ivas_omasa_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -291,12 +291,6 @@ ivas_error ivas_omasa_enc_config( 
        else

        {

            hEncoderConfig->element_mode_init = IVAS_CPE_DFT;

#ifdef NONBE_FIX_874_OMASA_BRSW_2TD

            if ( ivas_total_brate - ism_total_brate < MASA_STEREO_MIN_BITRATE  )

            {

                st_ivas->hCPE[0]->element_mode = IVAS_CPE_DFT;

            }

#endif

        }

    }

lib_enc/ivas_stereo_classifier.c

+8 −5
Original line number Diff line number Diff line
@@ -90,10 +90,6 @@ int16_t select_stereo_mode( 
    CPE_ENC_HANDLE hCPE,           /* i/o: CPE encoder structure       */

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

    const int32_t ivas_total_brate /* i  : IVAS total brate            */

#ifdef NONBE_FIX_874_OMASA_BRSW_2TD

    ,

    const int32_t cpe_brate /* i   : bitrate for CPE in combined format             */

#endif

)

{

    int16_t element_mode;
@@ -118,7 +114,7 @@ int16_t select_stereo_mode( 


#ifdef NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING

#ifdef NONBE_FIX_874_OMASA_BRSW_2TD

    if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO || ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && cpe_brate < MASA_STEREO_MIN_BITRATE )

    if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO || ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && hCPE->element_brate < MASA_STEREO_MIN_BITRATE )

#else

    if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO || ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && ivas_total_brate < MASA_STEREO_MIN_BITRATE )

#endif
@@ -130,6 +126,7 @@ int16_t select_stereo_mode( 
#endif

    )

    {



        stereo_switching_flag = 0;

    }
@@ -170,6 +167,12 @@ int16_t select_stereo_mode( 
            {

                element_mode = hCPE->stereo_mode_cmdl;

            }

#endif

#ifdef NONBE_FIX_874_OMASA_BRSW_2TD

            if ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && cpe_brate < MASA_STEREO_MIN_BITRATE )

            {

                hCPE->element_mode = IVAS_CPE_DFT;

            }

#endif

        }

        else if ( element_mode == IVAS_CPE_TD )