Commit c9ac3eae authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '1589-port-float-mr-1364' into 'float-pc' 

Resolve "Port float MR 1364"

See merge request !1595
parents bf978c81 83c0bae1

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ 




#define NONBE_FIX_979_OSBA_STEREO_5MS                    /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */

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





/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_ism_param_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -996,7 +996,11 @@ 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 */
@@ -1029,8 +1033,12 @@ 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 );