Commit f5718228 authored by vaclav's avatar vaclav
Browse files

accept FIX_863_REMOVE_REDUNDANCIES_OMASA

parent a8a15539

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_863_REMOVE_REDUNDANCIES_OMASA               /* Nokia/VA: Issue 863: Remove redundancies in stereo_classifier for OMASA */

#define FIX_879_USAN_ERROR_IN_MASA_DECODING             /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */



/* #################### End BE switches ################################## */

lib_enc/ivas_masa_enc.c

+1 −4
Original line number Diff line number Diff line
@@ -1983,11 +1983,8 @@ void ivas_masa_enc_reconfigure( 
                copy_encoder_config( st_ivas, st_ivas->hCPE[cpe_id]->hCoreCoder[n], 0 );

                st_ivas->hCPE[cpe_id]->hCoreCoder[n]->total_brate = st_ivas->hCPE[cpe_id]->element_brate / ( st_ivas->nCPE > 1 ? 1 : CPE_CHANNELS ); /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */

            }

#ifdef FIX_863_REMOVE_REDUNDANCIES_OMASA



            if ( ivas_total_brate - ism_total_brate < MIN_BRATE_MDCT_STEREO )

#else

            if ( ivas_total_brate - ism_total_brate < MASA_STEREO_MIN_BITRATE || ivas_total_brate - ism_total_brate < MIN_BRATE_MDCT_STEREO )

#endif

            {

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

            }

lib_enc/ivas_stereo_classifier.c

+1 −4
Original line number Diff line number Diff line
@@ -124,11 +124,8 @@ int16_t select_stereo_mode( 
    {

        stereo_switching_flag = 0;

    }

#ifdef FIX_863_REMOVE_REDUNDANCIES_OMASA



    if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO )

#else

    if ( hCPE->element_brate >= MIN_BRATE_MDCT_STEREO && !( hCPE->element_brate == IVAS_48k && ivas_total_brate == IVAS_32k ) ) /* the second condition for PARAM mode OMASA */

#endif

    {

        hStereoClassif->prev_lrtd_mode = 0;

        hStereoClassif->lrtd_mode = 0;