Commit 52efb9b5 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_983_DISC_ISM_DIGEST_NUM_OBJS

parent de525778

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

#define FIX_983_DISC_ISM_DIGEST_NUM_OBJS                /* FhG: issue #983: the discrete ISM digest function uses the wrong number of objects */





#define FIX_976_USAN_PVQ_ENC_DEC_EVS_CR                      /* Ericsson:  premature cast to unsigned detected by USAN corrected  */

lib_dec/ivas_ism_param_dec.c

+0 −10
Original line number Diff line number Diff line
@@ -996,11 +996,7 @@ void ivas_ism_dec_digest_tc( 
         st_ivas->renderer_type == RENDERER_OSBA_STEREO ||

         ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->hDecoderConfig->Opt_Headrotation == 0 ) )

    {

#ifdef FIX_983_DISC_ISM_DIGEST_NUM_OBJS

        int16_t i;

#else

        int16_t i, num_objects;

#endif

        int16_t azimuth, elevation;



        /* we have a full frame interpolator, adapt it */
@@ -1033,13 +1029,7 @@ void ivas_ism_dec_digest_tc( 
        }



        /* also get the gains here */

#ifdef FIX_983_DISC_ISM_DIGEST_NUM_OBJS

        for ( i = 0; i < st_ivas->nchan_ism; i++ )

#else

        num_objects = st_ivas->nchan_transport;



        for ( i = 0; i < num_objects; i++ )

#endif

        {

            mvr2r( st_ivas->hIsmRendererData->gains[i], st_ivas->hIsmRendererData->prev_gains[i], MAX_OUTPUT_CHANNELS );