Commit 4fdaa656 authored by vaclav's avatar vaclav
Browse files

clang-format

parent 430576ba

apps/decoder.c

+3 −1
Original line number Diff line number Diff line
@@ -927,6 +927,7 @@ cleanup: 
        free( arg.aeSequence.pValidity );

    }

#endif



#ifdef DEBUG_SBA_AUDIO_DUMP

    IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );
@@ -1142,6 +1143,7 @@ static bool parseCmdlIVAS_dec( 
    arg->tsmScaleFileName = NULL;

#endif

#endif



#ifdef FIX_1053_REVERB_RECONFIGURATION

    arg->aeSequence.count = 0;

    arg->aeSequence.pID = NULL;
@@ -2293,6 +2295,7 @@ static ivas_error decodeG192( 
        }

    }

#endif



    for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )

    {

        ismWriters[i] = NULL;
@@ -2301,7 +2304,6 @@ static ivas_error decodeG192( 
    /* we always start with needing a new frame */

    needNewFrame = true;





    if ( !arg.quietModeEnabled )

    {

        fprintf( stdout, "\n------ Running the decoder ------\n\n" );

apps/renderer.c

+2 −0
Original line number Diff line number Diff line
@@ -2036,12 +2036,14 @@ cleanup: 
        free( bitsBufferData );

    }

#endif



#ifdef FIX_1053_REVERB_RECONFIGURATION

    if ( args.aeSequence.count > 0 )

    {

        free( args.aeSequence.pID );

        free( args.aeSequence.pValidity );

    }



#endif

    for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )

    {

lib_dec/ivas_binRenderer_internal.c

+2 −1
Original line number Diff line number Diff line
@@ -54,8 +54,9 @@ 
 *------------------------------------------------------------------------*/



#define REVERB_INPUT_DOWNMIX_CHANNELS ( 11 )



/* Downmix table for sparse frequency domain reverberator */

const float dmxmtx_table[BINAURAL_CHANNELS][REVERB_INPUT_DOWNMIX_CHANNELS] = {

static 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 },

};

lib_dec/ivas_rom_dec.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ extern const float dirac_dithering_ele_scale[DIRAC_DIFFUSE_LEVELS]; 
extern const float dmxmtx_table[BINAURAL_CHANNELS][11];

#endif





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

 * MC ParamUpmix ROM tables

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

lib_rend/lib_rend.c

+4 −1
Original line number Diff line number Diff line
@@ -4463,6 +4463,7 @@ int16_t IVAS_REND_FeedRenderConfig( 
            /* Skip inactive inputs */

            continue;

        }



        if ( pIsmInput->hReverb != NULL )

        {

            if ( ( error = ivas_reverb_open( &pIsmInput->hReverb, hIvasRend->hHrtfs.hHrtfStatistics, hRenderConfig, *pIsmInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
@@ -4470,6 +4471,7 @@ int16_t IVAS_REND_FeedRenderConfig( 
                return error;

            }

        }



        if ( pIsmInput->crendWrapper != NULL && pIsmInput->crendWrapper->hCrend[0] != NULL )

        {

#ifdef SPLIT_REND_WITH_HEAD_ROT
@@ -4540,6 +4542,7 @@ int16_t IVAS_REND_FeedRenderConfig( 
                return error;

            }

        }



#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( pMcInput->crendWrapper != NULL && pMcInput->crendWrapper->hCrend[0] && pMcInput->crendWrapper->hCrend[0]->hReverb != NULL )

        {