Commit 86cc3d3c authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 115_bitrateswitching_ISM

parents 70ce38a3 52f6c004

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -149,9 +149,9 @@ 
#define FIX_I13_TCX_TNS_ISSUE                           /* Issue 13: Fix reported artifacts. Bug in TNS with TCX5 */

#define CORECODER_BITRATE_SWITCHING                     /* Issue 133: support bitrate switching in core-coder */



#define ISM_BITRATE_SWITCHING                           /* Issue 115: Support for Bitrate Switching in ISM */





#define ISM_BITRATE_SWITCHING                           /* Issue 115: Support for Bitrate Switching in ISM */





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

lib_enc/ivas_ism_param_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ ivas_error ivas_ism_enc_config( 
            }

        }



        if ( ( st_ivas->ism_mode == ISM_MODE_DISC ) && ( last_ism_mode == ISM_MODE_PARAM ) )

        if ( st_ivas->ism_mode == ISM_MODE_DISC && last_ism_mode == ISM_MODE_PARAM )

        {

            /* Deallocate the memory used by ParamISM when switch to Discrete ISM */

            ivas_param_ism_enc_close( st_ivas->hDirAC, st_ivas->hEncoderConfig->input_Fs );