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

[cleanup] accept FIX_1009_ISM_NONDIEGETIC_PANNING

parent 9c0868c9

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -795,9 +795,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
@@ -194,7 +194,6 @@ 
#define FIX_1020_AEID_SELECTION_ERRORS                   /* Philips: issue #1020: fix for acoustic environment ID selection errors */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS             /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF */             /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/

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

#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER            /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */

#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO             /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

lib_dec/ivas_jbm_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1061,11 +1061,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

lib_dec/ivas_mono_dmx_renderer.c

+0 −7
Original line number Diff line number Diff line
@@ -220,9 +220,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;

}