Commit 7e303afd authored by vaclav's avatar vaclav
Browse files

port FIX_957_REMOVE_PANNING_DEAD_CODE

parent f9a567b8

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ 
#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS

#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#endif

#define FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */



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

lib_dec/ivas_jbm_dec.c

+4 −2
Original line number Diff line number Diff line
@@ -2004,12 +2004,14 @@ ivas_error ivas_jbm_dec_render_fx( 
            {

                ivas_dirac_dec_binaural_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output_fx );

            }

#ifndef FIX_957_REMOVE_PANNING_DEAD_CODE

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_NON_DIEGETIC_DOWNMIX ) )

            {

                *nSamplesRendered = s_min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

                move16();

                ivas_apply_non_diegetic_panning_fx( p_output_fx, st_ivas->hDecoderConfig->non_diegetic_pan_gain_fx, *nSamplesRendered );

            }

#endif

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_PARAM_ISM ) || EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )

            {

                ivas_param_ism_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx );
@@ -2044,7 +2046,7 @@ ivas_error ivas_jbm_dec_render_fx( 
#ifdef MSAN_FIX

                FOR( i = 0; i < st_ivas->nchan_transport; i++ )

                {

                    FOR( j = 0; j < 16; j++ )

                    FOR( j = 0; j < HOA3_CHANNELS; j++ )

                    {

                        st_ivas->hIsmRendererData->gains_fx[i][j] = L_shr( st_ivas->hIsmRendererData->gains_fx[i][j], 1 ); // Q30 -> Q29

                        move32();
@@ -2055,7 +2057,7 @@ ivas_error ivas_jbm_dec_render_fx( 
#else

                FOR( i = 0; i < 15; i++ )

                {

                    FOR( j = 0; j < 16; j++ )

                    FOR( j = 0; j < HOA3_CHANNELS; j++ )

                    {

                        st_ivas->hIsmRendererData->gains_fx[i][j] = L_shr( st_ivas->hIsmRendererData->gains_fx[i][j], 1 );           // Q30 -> Q29

                        st_ivas->hIsmRendererData->prev_gains_fx[i][j] = L_shr( st_ivas->hIsmRendererData->prev_gains_fx[i][j], 1 ); // Q30 -> Q29