Commit 6f55992a authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_1009_ISM_NONDIEGETIC_PANNING

parent 8906317e

lib_com/ivas_prot_fx.h

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



void ivas_apply_non_diegetic_panning_fx(

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

    Word32 *input_f_fx,                                             /* i  : non-diegetic object                                         */

#endif

    Word32 *output_f_fx[],                 /* i/o: core-coder transport mono channel/stereo output  */

    const Word16 non_diegetic_pan_gain_fx, /* i  : non-diegetic panning gain                        */

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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ 
//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

#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 activate 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_fx.c

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

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

            {

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

                ivas_apply_non_diegetic_panning_fx( p_tc_fx[0], p_output_fx, st_ivas->hDecoderConfig->non_diegetic_pan_gain_fx, *nSamplesRendered );

#else

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

#endif

            }

#ifdef DEBUGGING

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

lib_dec/ivas_mono_dmx_renderer_fx.c

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



void ivas_apply_non_diegetic_panning_fx(

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

    Word32 *input_f_fx, /* i  : non-diegetic object                                 */

#endif

    Word32 *output_f_fx[],                 /* o: core-coder transport mono channel/stereo output       */

    const Word16 non_diegetic_pan_gain_fx, /* i  : non-diegetic panning gain                        Q15*/

    const Word16 output_frame              /* i  : output frame length per channel                  Q11*/
@@ -331,13 +329,8 @@ void ivas_apply_non_diegetic_panning_fx( 
    pan_left_fx = add( mult( non_diegetic_pan_gain_fx, 16384 ), 16384 ); // 0.5.Q15 = 16384

    pan_right_fx = sub( 32767, pan_left_fx );



#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

    v_multc_fixed( input_f_fx, L_shl( L_deposit_l( pan_right_fx ), 16 ), output_f_fx[1], output_frame );

    v_multc_fixed( input_f_fx, L_shl( L_deposit_l( pan_left_fx ), 16 ), output_f_fx[0], output_frame );

#else

    v_multc_fixed( output_f_fx[0], L_shl( L_deposit_l( pan_right_fx ), 16 ), output_f_fx[1], output_frame );

    v_multc_fixed( output_f_fx[0], L_shl( L_deposit_l( pan_left_fx ), 16 ), output_f_fx[0], output_frame );

#endif



    return;

}