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

[cleanup] accept NONBE_FIX_967_ISM_MONO_DMX

parent 0a474137

lib_com/ivas_prot_fx.h

+0 −4
Original line number Diff line number Diff line
@@ -1160,11 +1160,7 @@ void ivas_apply_non_diegetic_panning_fx( 
    const Word16 output_frame              /* i  : output frame length per channel                  */

);



#ifdef NONBE_FIX_967_ISM_MONO_DMX

void ivas_ism_mono_dmx_fx(

#else

void ivas_mono_downmix_render_passive_fx(

#endif

    Decoder_Struct *st_ivas,  /* i/o: IVAS decoder structure                                */

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

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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ 
#endif

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#define FIX_963_USAN_ERROR                              /* Eri: Issue 963: USAN error in Stereo CNG, division by zero */

#define NONBE_FIX_967_ISM_MONO_DMX                      /* FhG: issue 967: accumulating energies in ISM mono DMX */



#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

#define NONBE_FIX_973_HODIRAC_BAND_GROUPING                   /* FhG: issue 973: empty parameter band in DirAC */

lib_dec/ivas_jbm_dec_fx.c

+0 −12
Original line number Diff line number Diff line
@@ -265,11 +265,7 @@ ivas_error ivas_jbm_dec_tc_fx( 
        test();

        IF( EQ_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) )

        {

#ifdef NONBE_FIX_967_ISM_MONO_DMX

            ivas_ism_mono_dmx_fx( st_ivas, p_output_fx, output_frame );

#else

            ivas_mono_downmix_render_passive_fx( st_ivas, p_output_fx, output_frame );

#endif



            Scale_sig32( p_output_fx[0], L_FRAME48k, 3 );

        }
@@ -798,11 +794,7 @@ ivas_error ivas_jbm_dec_tc_fx( 
        move16();

        IF( EQ_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) )

        {

#ifdef NONBE_FIX_967_ISM_MONO_DMX

            ivas_ism_mono_dmx_fx( st_ivas, p_output_fx, output_frame );

#else

            ivas_mono_downmix_render_passive_fx( st_ivas, p_output_fx, output_frame );

#endif



            output_q = 8;

            move16();
@@ -1090,11 +1082,7 @@ ivas_error ivas_jbm_dec_tc_fx( 
        }

        ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )

        {

#ifdef NONBE_FIX_967_ISM_MONO_DMX

            ivas_ism_mono_dmx_fx( st_ivas, p_output_fx, output_frame );

#else

            ivas_mono_downmix_render_passive_fx( st_ivas, p_output_fx, output_frame );

#endif



            Scale_sig32( p_output_fx[0], L_FRAME48k, Q11 - Q8 ); // Q11

lib_dec/ivas_mono_dmx_renderer_fx.c

+0 −18
Original line number Diff line number Diff line
@@ -46,12 +46,7 @@ 
 * Local constants

 *------------------------------------------------------------------------*/

#define DOWNMIX_ALPHA_FX 31130 /* Smoothing coefficient alpha */

#ifdef NONBE_FIX_967_ISM_MONO_DMX

#define DOWNMIX_ONE_MINUS_ALPHA_FX 1638 /* Smoothing coefficient (1 - alpha) */

#endif

#ifndef NONBE_FIX_967_ISM_MONO_DMX

#define MONO_DOWNMIX_RENDERER_MAX_INPUT_CHANS 4

#endif



/*-------------------------------------------------------------------------

 * ivas_mono_dmx_renderer_open()
@@ -111,11 +106,7 @@ void ivas_mono_dmx_renderer_close( 
 *

 * Downmix process

 *------------------------------------------------------------------------*/

#ifdef NONBE_FIX_967_ISM_MONO_DMX

void ivas_ism_mono_dmx_fx(

#else

void ivas_mono_downmix_render_passive_fx(

#endif

    Decoder_Struct *st_ivas,  /* i/o: IVAS decoder structure                                */

    Word32 *output_f_fx[],    /* i/o: synthesized core-coder transport channels/mono output Qin = 11/ Qout = 8*/

    const Word16 output_frame /* i  : output frame length                                   */
@@ -170,13 +161,6 @@ void ivas_mono_downmix_render_passive_fx( 
        v_add_32( output_shr, proto_signal_fx, proto_signal_fx, output_frame );

    }



#ifndef NONBE_FIX_967_ISM_MONO_DMX

    /* compute the input energy, proto energy after smoothing */

    hDownmix->inputEnergy_fx = Mpy_32_16_1( hDownmix->inputEnergy_fx, DOWNMIX_ALPHA_FX );

    move32();

    hDownmix->protoEnergy_fx = Mpy_32_16_1( hDownmix->protoEnergy_fx, DOWNMIX_ALPHA_FX );

    move32();

#endif



    proto_norm = L_norm_arr( proto_signal_fx, output_frame );
@@ -197,7 +181,6 @@ void ivas_mono_downmix_render_passive_fx( 
        }

    }



#ifdef NONBE_FIX_967_ISM_MONO_DMX

    hDownmix->inputEnergy_fx = Mpy_32_16_1( hDownmix->inputEnergy_fx, DOWNMIX_ALPHA_FX );

    move32();

    hDownmix->protoEnergy_fx = Mpy_32_16_1( hDownmix->protoEnergy_fx, DOWNMIX_ALPHA_FX );
@@ -205,7 +188,6 @@ void ivas_mono_downmix_render_passive_fx( 


    protoEner_pre = Mpy_32_16_1( protoEner_pre, DOWNMIX_ONE_MINUS_ALPHA_FX );

    inputEner_pre = Mpy_32_16_1( inputEner_pre, DOWNMIX_ONE_MINUS_ALPHA_FX );

#endif



    /* compute the eq factor */