Commit 271759c0 authored by PLAINSI's avatar PLAINSI
Browse files

Merge branch 'main' into 471-integrate-the-multichannel-parametric-upmix-into-the-jbm-path

parents c6bbc2d7 45bdd90e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ 
#define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */

#define FIX_593_STL_INCLUDE                             /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */

#define FIX_583_CLANG_TRANS_DET                         /* FhG: Issue 583: clang left shift on ramp_up_flag in transient detector */

#define NONBE_FIX_589_JBM_TC_OFFSETS                    /* FhG: issue 589: wrong offset into the TC buffers is used in some rendering paths in the JBM main rendering function */

#define JBM_PARAMUPMIX                                  /* Dlb: Issue 471: Integrate the Multichannel Parametric Upmix into the JBM path */



/* ################## End BE DEVELOPMENT switches ######################### */

lib_dec/ivas_jbm_dec.c

+18 −2
Original line number Diff line number Diff line
@@ -739,8 +739,13 @@ ivas_error ivas_jbm_dec_render( 
                *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

                pan_left = ( st_ivas->hDecoderConfig->non_diegetic_pan_gain + 1.f ) * 0.5f;

                pan_right = 1.f - pan_left;

#ifdef NONBE_FIX_589_JBM_TC_OFFSETS

                v_multc( p_tc[0], pan_right, output[1], *nSamplesRendered );

                v_multc( p_tc[0], pan_left, output[0], *nSamplesRendered );

#else

                v_multc( st_ivas->hTcBuffer->tc[0], pan_right, output[1], *nSamplesRendered );

                v_multc( st_ivas->hTcBuffer->tc[0], pan_left, output[0], *nSamplesRendered );

#endif

            }

            else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

            {
@@ -767,8 +772,13 @@ ivas_error ivas_jbm_dec_render( 
            {

                pan_left = ( st_ivas->hDecoderConfig->non_diegetic_pan_gain + 1.f ) * 0.5f;

                pan_right = 1.f - pan_left;

#ifdef NONBE_FIX_589_JBM_TC_OFFSETS

                v_multc( p_tc[0], pan_right, output[1], *nSamplesRendered );

                v_multc( p_tc[0], pan_left, output[0], *nSamplesRendered );

#else

                v_multc( st_ivas->hTcBuffer->tc[0], pan_right, output[1], *nSamplesRendered );

                v_multc( st_ivas->hTcBuffer->tc[0], pan_left, output[0], *nSamplesRendered );

#endif

            }

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

            {
@@ -858,8 +868,11 @@ ivas_error ivas_jbm_dec_render( 
                {

                    return error;

                }



#ifdef NONBE_FIX_589_JBM_TC_OFFSETS

                ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, p_tc, p_output );

#else

                ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, st_ivas->hTcBuffer->tc, p_output );

#endif

            }

            else if ( st_ivas->renderer_type == RENDERER_MC )

            {
@@ -876,8 +889,11 @@ ivas_error ivas_jbm_dec_render( 
                {

                    return error;

                }



#ifdef NONBE_FIX_589_JBM_TC_OFFSETS

                ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, p_tc, p_output );

#else

                ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, st_ivas->hTcBuffer->tc, p_output );

#endif

            }

        }

#ifdef JBM_PARAMUPMIX