Commit 1021ba7e authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/ivas-float-update' into... 

Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 2107-ref-PortMr1671-from-float-cleanup-20240704
parents eed16dd0 0af0725e

lib_dec/lib_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -1212,8 +1212,15 @@ ivas_error IVAS_DEC_ReadFormat( 
        }



#ifdef FIX_HRTF_LOAD

#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN

        if ( ( renderer_type_old != st_ivas->renderer_type && renderer_type_old != RENDERER_DISABLE ) ||

             ( st_ivas->ini_active_frame > 0 &&

               ( ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode != ISM_MASA_MODE_DISC ) ||

                 ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->ism_mode != ISM_SBA_MODE_DISC ) ) ) )

#else

        if ( ( renderer_type_old != st_ivas->renderer_type && renderer_type_old != RENDERER_DISABLE ) ||

             ( st_ivas->ini_active_frame > 0 && ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && 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 */