Commit 8abc3e76 authored by vaclav's avatar vaclav
Browse files

fix wrt. NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH and NONBE_1303_REND_GRANULARITY dependency

parent 193c867d

lib_com/ivas_prot_fx.h

+4 −3
Original line number Diff line number Diff line
@@ -1010,14 +1010,15 @@ Word16 ivas_jbm_dec_get_render_granularity_fx( 
    const RENDERER_TYPE renderer_type,                          /* i  : renderer type                                               */

    const RENDERER_TYPE renderer_type_sec,                      /* i  : secondary renderer type                                     */

    const int32_t output_Fs                                     /* i  : sampling rate                                               */

);

#else

Word16 ivas_jbm_dec_get_render_granularity

Word16 ivas_jbm_dec_get_render_granularity(

    const RENDERER_TYPE rendererType, /* i  : renderer type     */

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

    const MC_MODE mc_mode,            /* i  : MC mode */

    const Word32 output_Fs            /* i  : sampling rate     */

    #endif

); 

#endif



// ivas_stereo_dft_com.c

void stereo_dft_config_fx(

lib_dec/lib_dec_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -3768,11 +3768,12 @@ ivas_error IVAS_DEC_ReadFormat( 
            // st_ivas->nchan_transport = nchan_transport_old; // ToDo: temporarily deactivated to keep FIX_HRTF_LOAD bit-exact but this is likely a bug in the main -> see issue #1200

#endif



#ifndef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

            if ( st_ivas->ivas_format == MASA_FORMAT )

            {

                st_ivas->nchan_ism = 0; // ToDo: temporary hack to keep FIX_HRTF_LOAD bit-exact but this is likely a bug in the main -> see issue #1199

            }



#endif

            IF( st_ivas->hTcBuffer == NULL )

            {

                return IVAS_ERR_UNEXPECTED_NULL_POINTER;