Commit fd5466f8 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Updated ParamBin downmix matrix handling reflecting review remarks

parent be21ff46

lib_dec/ivas_binRenderer_internal.c

+13 −6
Original line number Diff line number Diff line
@@ -51,6 +51,19 @@ 
#endif

#include "wmc_auto.h"



#ifdef FIX_1053_REVERB_RECONFIGURATION



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

 * Local constants

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



#define REVERB_INPUT_DOWNMIX_CHANNELS ( 11 )

    /* Downmix table for sparse frequency domain reverberator */

const float dmxmtx_table[BINAURAL_CHANNELS][REVERB_INPUT_DOWNMIX_CHANNELS] = {

    { 1.0f, 0.0f, 0.70709997f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f },

    { 0.0f, 1.0f, 0.70709997f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f },

};

#endif



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

 * ivas_binRenderer_filterModule()
@@ -1104,11 +1117,7 @@ ivas_error ivas_binRenderer_open( 
)

{

    BINAURAL_RENDERER_HANDLE hBinRenderer;

#ifdef FIX_1053_REVERB_RECONFIGURATION

    int16_t convBand, k;

#else

    int16_t convBand, chIdx, k;

#endif

    ivas_error error;



    error = IVAS_ERR_OK;
@@ -1263,7 +1272,6 @@ ivas_error ivas_binRenderer_open( 
        {

            return error;

        }

#ifndef FIX_1053_REVERB_RECONFIGURATION

        /* initialize the dmx matrix */

        if ( hBinRenderer->nInChannels != HOA3_CHANNELS )

        {
@@ -1275,7 +1283,6 @@ ivas_error ivas_binRenderer_open( 
                }

            }

        }

#endif

    }

    else

    {

lib_rend/ivas_reverb.c

+0 −20
Original line number Diff line number Diff line
@@ -82,15 +82,6 @@ const int16_t default_loop_delay_48k[IVAS_REV_MAX_NR_BRANCHES] = { 2309, 1861, 1 
const int16_t default_loop_delay_32k[IVAS_REV_MAX_NR_BRANCHES] = { 1531, 1237, 1013, 839, 709, 613, 541, 479 };

const int16_t default_loop_delay_16k[IVAS_REV_MAX_NR_BRANCHES] = { 769, 619, 509, 421, 353, 307, 269, 239 };



#ifdef FIX_1053_REVERB_RECONFIGURATION

#define REVERB_INPUT_DOWNMIX_CHANNELS ( 11 )

/* Downmix table for sparse frequency domain reverberator */

const float dmxmtx_table[BINAURAL_CHANNELS][REVERB_INPUT_DOWNMIX_CHANNELS] = {

    { 1.0f, 0.0f, 0.70709997f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f },

    { 0.0f, 1.0f, 0.70709997f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f },

};

#endif



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

 * Local Struct definition

 *------------------------------------------------------------------------------------------*/
@@ -1943,17 +1934,6 @@ static ivas_error ivas_binaural_reverb_open( 


    ivas_binaural_reverb_setPreDelay( hReverb, preDelay );



#ifdef FIX_1053_REVERB_RECONFIGURATION

    /* initialize the dmx matrix */

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

    {

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

        {

            hReverb->dmxmtx[chIdx][k] = dmxmtx_table[chIdx][k];

        }

    }

#endif



    return IVAS_ERR_OK;

}