Commit db83650b authored by TYAGIRIS's avatar TYAGIRIS
Browse files

HP20 fix for bitrate switching between different SBA analysis orders

parent 685d0d5a

lib_enc/ivas_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ ivas_error ivas_enc( 
    {

        if ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->sba_mode == SBA_MODE_SPAR )

#ifdef HODIRAC

              && !( st_ivas->sba_analysis_order > 1 && ivas_total_brate > IVAS_256k )

             && !( st_ivas->sba_analysis_order > 1 )

#endif

        )

        {

lib_enc/ivas_init_enc.c

+3 −12
Original line number Diff line number Diff line
@@ -196,19 +196,10 @@ int16_t getNumChanAnalysis( 
    if ( st_ivas->hEncoderConfig->ivas_format == SBA_FORMAT )

    {

#ifdef HODIRAC

        /* tyagiri:TODO: best keep it unchanged */

        /* wkr: i made it conditional on the bitrate, 

		but in general it must take a different value than ivas_sba_get_nchan_metadata

		because DirAC needs a different number than SPAR */

        if ( st_ivas->hEncoderConfig->ivas_total_brate > IVAS_256k )

        {

        n = ( st_ivas->sba_analysis_order + 1 ) * ( st_ivas->sba_analysis_order + 1 );

        }

        else

#endif

        {

#else

        n = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->ivas_total_brate );

        }

#endif

    }

    else if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_PARAMMC || st_ivas->mc_mode == MC_MODE_MCMASA ) )

    {