Commit 4f9ad3f3 authored by vaclav's avatar vaclav
Browse files

fix compilation warning

parent 3268acbf

lib_com/ivas_prot.h

+4 −2
Original line number Diff line number Diff line
@@ -1925,8 +1925,10 @@ void stereo_icBWE_decproc( 
/*! r: element mode */

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                                */

    const IVAS_FORMAT ivas_format                               /* i  : IVAS format                                     */

#ifndef NONBE_FIX_874_OMASA_BRSW_2TD

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

    #endif

);



void stereo_classifier_init(

lib_enc/ivas_cpe_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -176,7 +176,11 @@ ivas_error ivas_cpe_enc( 


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

    {

#ifdef NONBE_FIX_874_OMASA_BRSW_2TD

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

#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_stereo_classifier.c

+5 −3
Original line number Diff line number Diff line
@@ -88,8 +88,10 @@ static float redge_detect( const float *inp, const int16_t len, const float inp_ 
/*! r: element mode */

int16_t select_stereo_mode(

    CPE_ENC_HANDLE hCPE,          /* i/o: CPE encoder structure       */

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

    const IVAS_FORMAT ivas_format /* i  : IVAS format                 */

#ifndef NONBE_FIX_874_OMASA_BRSW_2TD

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

#endif

)

{

    int16_t element_mode;
@@ -129,6 +131,7 @@ int16_t select_stereo_mode( 


        stereo_switching_flag = 0;

    }



#ifdef FIX_863_REMOVE_REDUNDANCIES_OMASA

    if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO )

#else
@@ -144,7 +147,6 @@ int16_t select_stereo_mode( 
        hStereoClassif->lrtd_mode = 0;

        element_mode = IVAS_CPE_DFT;





#ifdef NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING

        if ( stereo_switching_flag == 1 && hCPE->element_brate > IVAS_13k2 && hCPE->hCoreCoder[0]->hSpMusClas->past_dlp[0] < 1.0f && hCPE->hCoreCoder[0]->hSpMusClas->wdlp_xtalk < -0.01f && hCPE->hCoreCoder[0]->vad_flag == 1 && ( hCPE->hStereoMdct->sw_uncorr || hStereoClassif->xtalk_decision ) )

#else