Commit 82add814 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1605_ref_port_fl1389' into 'float-pc' 

Port MR 1389 into float-pc

See merge request !1616
parents 766fea43 55c24ade

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ 
#define NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN             /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */

#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS              /* FhG : issue #982 : 5ms and 20ms output different for OMASA */

#define NONBE_FIX_975_JBM_USAN                          /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */

#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */



#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */

lib_dec/ivas_jbm_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -143,11 +143,13 @@ ivas_error ivas_jbm_dec_tc( 
        {

            hp20( p_output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );

        }

#ifndef FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO



        if ( st_ivas->renderer_type == RENDERER_MC && st_ivas->hDecoderConfig->nchan_out == 1 )

        {

            ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, output_frame, p_output, p_output );

        }

#endif

    }

    else if ( st_ivas->ivas_format == ISM_FORMAT )

    {