Commit d2ae3897 authored by vaclav's avatar vaclav
Browse files

Merge branch '2255-missing-check-in-isar_render_poses' into 'main' 

Resolve "Missing check in isar_render_poses()"

Closes #2255

See merge request !2622
parents 65ff022e 0b7d8aba

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
/*#define DISABLE_LIMITER*/



/* ################### Start MAINTENANCE switches ########################### */

#define FIX_2255_ISAR_RENDER_POSES                           /* VA: issue 2255: fix missing check in isar_render_poses() */



/* ################### Start BE switches ################################# */

/* only BE switches wrt wrt. TS 26.251 V3.0 */

lib_dec/lib_dec_fx.c

+10 −0
Original line number Diff line number Diff line
@@ -1208,8 +1208,18 @@ static ivas_error isar_render_poses( 
        /* hIvasDec->flushbuffer = (void *) malloc( sizeof( Word16 ) * numPoses * BINAURAL_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ); */

        /* set16_fx( (Word16 *) hIvasDec->flushbuffer, 0, numPoses * BINAURAL_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ); */

        Word16 num_samples_flushbuffer;

#ifdef FIX_2255_ISAR_RENDER_POSES

        num_samples_flushbuffer = mult0( shl( numPoses, 1 ) /* shl() == numPoses * BINAURAL_CHANNELS */, div_l( hIvasDec->nSamplesFrame, IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) );

#else

        num_samples_flushbuffer = mult0( mult0( numPoses, BINAURAL_CHANNELS ), shl( div_l( hIvasDec->nSamplesFrame, IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ), 1 ) );

#endif

        hIvasDec->flushbuffer = (void *) malloc( L_mult0( sizeof( Word16 ), num_samples_flushbuffer ) );

#ifdef FIX_2255_ISAR_RENDER_POSES

        if ( hIvasDec->flushbuffer == NULL )

        {

            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate flush buffer" );

        }

#endif

        set16_fx( (Word16 *) hIvasDec->flushbuffer, 0, num_samples_flushbuffer );

    }