Commit 79447740 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch '1890_basop_mr2052_part2' into 'main' 

[non-BE] BASOP porting of MR 2052 (#1890) - part2

See merge request !2387
parents 36f0a8dc 92279bac

lib_dec/lib_dec_fx.c

+7 −0
Original line number Diff line number Diff line
@@ -3746,8 +3746,15 @@ ivas_error IVAS_DEC_ReadFormat( 
        test();

        test();

        test();

#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN

        IF( ( NE_32( renderer_type_old, st_ivas->renderer_type ) && NE_32( renderer_type_old, RENDERER_DISABLE ) ) ||

            ( st_ivas->ini_active_frame > 0 &&

              ( ( ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) && NE_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) ) ||

                ( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && NE_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) ) ) ) )

#else

        IF( ( NE_32( renderer_type_old, st_ivas->renderer_type ) && NE_32( renderer_type_old, RENDERER_DISABLE ) ) ||

            ( st_ivas->ini_active_frame > 0 && ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) && NE_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) ) )

#endif

        {

            /* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv

            render what still fits in the new granularity */