Commit a8dede3c authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Revert "scale binaural audio channels down to avoid clipping with BINAURAL_ROOM_REVERB" 

This reverts commit b301e223.
parent 0905bf0b

lib_com/ivas_prot.h

+0 −4
Original line number Diff line number Diff line
@@ -5225,10 +5225,6 @@ void ivas_binRenderer( 
#endif

    float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],                /* i  : LS signals                   */

    float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]                 /* i  : LS signals                   */

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

    ,

	AUDIO_CONFIG output_config                                                             /* i : output configuration */

#endif

);



void ivas_binaural_add_LFE(

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ 
#define NONBE_FIX_1000_G1_G2_SWB_TBE                          /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */

#define NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */



#define DISABLE_LIMITER



/* ##################### End NON-BE switches ########################### */



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

lib_dec/ivas_binRenderer_internal.c

+0 −37
Original line number Diff line number Diff line
@@ -1916,10 +1916,6 @@ void ivas_binRenderer( 
#endif

    float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i  : LS signals       */

    float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]  /* i  : LS signals       */

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

    ,

    AUDIO_CONFIG output_config /* i : output configuration */

#endif

)

{

    int16_t chIdx, k;
@@ -2053,39 +2049,6 @@ void ivas_binRenderer( 
            }

        }

    }

#endif



#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING



#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

    {

        for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ )

        {

            for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ )

            {

                for ( k = 0; k < numTimeSlots; k++ )

                {

                    v_multc( Cldfb_RealBuffer_Binaural[pos_idx][chIdx][k], 0.5f, Cldfb_RealBuffer_Binaural[pos_idx][chIdx][k], hBinRenderer->conv_band );

                    v_multc( Cldfb_ImagBuffer_Binaural[pos_idx][chIdx][k], 0.5f, Cldfb_ImagBuffer_Binaural[pos_idx][chIdx][k], hBinRenderer->conv_band );

                }

            }

        }

    }

#else

    if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

    {

        for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ )

        {

            for ( k = 0; k < numTimeSlots; k++ )

            {

                v_multc( Cldfb_RealBuffer_Binaural[chIdx][k], 0.5f, Cldfb_RealBuffer_Binaural[chIdx][k], hBinRenderer->conv_band );

                v_multc( Cldfb_ImagBuffer_Binaural[chIdx][k], 0.5f, Cldfb_ImagBuffer_Binaural[chIdx][k], hBinRenderer->conv_band );

            }

        }

    }

#endif



#endif



    /* Obtain the binaural dmx and compute the reverb */

lib_dec/ivas_dirac_dec.c

+1 −6
Original line number Diff line number Diff line
@@ -2407,12 +2407,7 @@ void ivas_dirac_dec_render_sf( 
#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG

                          NULL,

#endif

                          Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

                          ,

                          st_ivas->hDecoderConfig->output_config

#endif

        );

                          Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {

lib_dec/ivas_mc_param_dec.c

+1 −6
Original line number Diff line number Diff line
@@ -1825,12 +1825,7 @@ void ivas_param_mc_dec_render( 
#endif

                              st_ivas->hCombinedOrientationData,

                              hParamMC->subframe_nbslots[subframe_idx],

                              Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

                              ,

                              st_ivas->hDecoderConfig->output_config

#endif

            );

                              Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );



#ifdef SPLIT_REND_WITH_HEAD_ROT

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )