Commit 7485104e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1009_ISM_NONDIEGETIC_PANNING

parent a1c5c0e3

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -769,9 +769,7 @@ void dtx_read_padding_bits( 
);



void ivas_apply_non_diegetic_panning( 

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

    float *input_f,                                             /* i  : non-diegetic object                                         */

#endif

    float *output_f[],                                          /* o  : core-coder transport mono channel/stereo output             */

    const float non_diegetic_pan_gain,                          /* i  : non-diegetic panning gain                                   */

    const int16_t output_frame                                  /* i  : output frame length per channel                             */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_1009_ISM_NONDIEGETIC_PANNING                /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan      */

#define FIX_1020_AEID_SELECTION_ERRORS                  /* Philips: issue #1020: fix for acoustic environment ID selection errors */

#define FIX_993_REMOVE_SBA_GET_ORDER                    /* VA: issue 993: remove unused function ivas_sba_get_order() */

#define FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE            /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions   */

lib_dec/ivas_jbm_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1097,11 +1097,7 @@ ivas_error ivas_jbm_dec_render( 
            }

            else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )

            {

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

                ivas_apply_non_diegetic_panning( p_tc[0], p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

#else

                ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

#endif

            }

#ifdef DEBUGGING

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

lib_dec/ivas_mono_dmx_renderer.c

+0 −7
Original line number Diff line number Diff line
@@ -221,9 +221,7 @@ void ivas_mono_stereo_downmix_mcmasa( 
 *------------------------------------------------------------------------*/



void ivas_apply_non_diegetic_panning(

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

    float *input_f, /* i  : non-diegetic object                                         */

#endif

    float *output_f[],                 /* o  : core-coder transport mono channel/stereo output  */

    const float non_diegetic_pan_gain, /* i  : non-diegetic panning gain                        */

    const int16_t output_frame         /* i  : output frame length per channel                  */
@@ -233,13 +231,8 @@ void ivas_apply_non_diegetic_panning( 


    pan_left = ( non_diegetic_pan_gain + 1.f ) * 0.5f;

    pan_right = 1.f - pan_left;

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

    v_multc( input_f, pan_right, output_f[1], output_frame );

    v_multc( input_f, pan_left, output_f[0], output_frame );

#else

    v_multc( output_f[0], pan_right, output_f[1], output_frame );

    v_multc( output_f[0], pan_left, output_f[0], output_frame );

#endif



    return;

}