Commit e0a027db authored by vaclav's avatar vaclav
Browse files

Merge branch '994-obsolete-call-of-ivas_ls_setup_conversion-in-stereo' into 'main' 

Resolve "Obsolete call of ivas_ls_setup_conversion() in stereo"

See merge request !1389
parents 2497b762 d6e5f8c8

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ 
#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */

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

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 )

    {