Commit f651c0d9 authored by vaclav's avatar vaclav
Browse files

fix clash between ISM_BITRATE_SWITCHING and FIX_155_HP20_ISSUE

parent c0dae506

lib_enc/ivas_ism_param_enc.c

+6 −3
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ 
#include "ivas_rom_com.h"

#include "wmops.h"





#ifndef FIX_155_HP20_ISSUE

#ifdef CORECODER_BITRATE_SWITCHING

static ivas_error ivas_hp20_reconfig( Encoder_Struct *st_ivas, const int16_t nchan_hp20_old );

#endif



#endif

/*-------------------------------------------------------------------------

 * Local function definitions

 *------------------------------------------------------------------------*/
@@ -534,6 +534,7 @@ ivas_error ivas_ism_enc_config( 
            st_ivas->hDirAC = NULL;

        }



#ifndef FIX_155_HP20_ISSUE

#ifdef CORECODER_BITRATE_SWITCHING

        ivas_hp20_reconfig( st_ivas, nchan_transport_old );

#else
@@ -574,6 +575,7 @@ ivas_error ivas_ism_enc_config( 


            set_f( st_ivas->mem_hp20_in[sce_id], 0.0f, L_HP20_MEM );

        }

#endif

#endif

    }

#else
@@ -588,7 +590,7 @@ ivas_error ivas_ism_enc_config( 
    return error;

}





#ifndef FIX_155_HP20_ISSUE

#ifdef CORECODER_BITRATE_SWITCHING

// VE: this is the same function as at the decoder -> harmonize them to a new file ivas_corecoder_reconfig.c

/*-------------------------------------------------------------------*
@@ -674,3 +676,4 @@ static ivas_error ivas_hp20_reconfig( 
    return error;

}

#endif

#endif