Commit a0561069 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

port FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO

parent 4eb66a95

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,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 */



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

lib_dec/ivas_jbm_dec_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ ivas_error ivas_jbm_dec_tc_fx( 
        {

            hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );

        }

#ifndef FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO



        test();

        IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) && EQ_16( st_ivas->hDecoderConfig->nchan_out, 1 ) )
@@ -192,6 +193,7 @@ ivas_error ivas_jbm_dec_tc_fx( 
                Scale_sig32( p_output_fx[i], output_frame, negate( s ) ); // Q11

            }

        }

#endif

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )

    {