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

formatting

parent b4b2d63c

lib_dec/ivas_mc_paramupmix_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -274,7 +274,6 @@ void ivas_mc_paramupmix_dec_render( 
            /* update combined orientation access index */

            ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );

        }



    }



    *nSamplesAvailable = ( st_ivas->hTcBuffer->num_slots - st_ivas->hTcBuffer->slots_rendered ) * slot_size;

lib_rend/lib_rend.c

+15 −29
Original line number Diff line number Diff line
@@ -1336,10 +1336,8 @@ static ivas_error setRendInputActiveIsm( 
    void *input,

    const AUDIO_CONFIG inConfig,

    const IVAS_REND_InputId id,

    RENDER_CONFIG_DATA *hRendCfg

    ,

    hrtf_handles *hrtfs

)

    RENDER_CONFIG_DATA *hRendCfg,

    hrtf_handles *hrtfs )

{

    ivas_error error;

    rendering_context rendCtx;
@@ -2247,13 +2245,11 @@ static ivas_error initMcBinauralRendering( 
        /* open CREND */

#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( ( error = ivas_rend_openCrend( &inputMc->crendWrapper, ( inConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM ) ? IVAS_AUDIO_CONFIG_7_1_4 : inConfig, outConfig, hRendCfg,

                                            hMixconv

                                            ,

                                            hMixconv,

                                            outSampleRate, ( ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) || ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) ) ? inputMc->base.ctx.pSplitRendWrapper->multiBinPoseData.num_poses : 1 ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_rend_openCrend( &inputMc->crendWrapper, ( inConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM ) ? IVAS_AUDIO_CONFIG_7_1_4 : inConfig, outConfig, hRendCfg,

                                            hMixconv

                                            ,

                                            hMixconv,

                                            outSampleRate ) ) != IVAS_ERR_OK )

#endif

        {
@@ -2380,10 +2376,8 @@ static ivas_error setRendInputActiveMc( 
    void *input,

    const AUDIO_CONFIG inConfig,

    const IVAS_REND_InputId id,

    RENDER_CONFIG_DATA *hRendCfg

    ,

    hrtf_handles *hrtfs

)

    RENDER_CONFIG_DATA *hRendCfg,

    hrtf_handles *hrtfs )

{

#ifdef SPLIT_REND_WITH_HEAD_ROT

    int16_t i;
@@ -2454,10 +2448,8 @@ static ivas_error setRendInputActiveMc( 
    if ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL || outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

    {

        if ( ( error = initMcBinauralRendering( inputMc, inConfig, outConfig, hRendCfg

                                                ,

                                                hrtfs->hSetOfHRTF

                                                ,

        if ( ( error = initMcBinauralRendering( inputMc, inConfig, outConfig, hRendCfg,

                                                hrtfs->hSetOfHRTF,

                                                FALSE ) ) != IVAS_ERR_OK )

        {

            return error;
@@ -2623,10 +2615,8 @@ static ivas_error initSbaPanGainsForSbaOut( 
static ivas_error updateSbaPanGains(

    input_sba *inputSba,

    const AUDIO_CONFIG outConfig,

    RENDER_CONFIG_DATA *hRendCfg

    ,

    IVAS_DEC_HRTF_CREND_HANDLE hMixconv

)

    RENDER_CONFIG_DATA *hRendCfg,

    IVAS_DEC_HRTF_CREND_HANDLE hMixconv )

{

    ivas_error error;

    AUDIO_CONFIG inConfig;
@@ -2758,8 +2748,7 @@ static ivas_error setRendInputActiveSba( 
    void *input,

    const AUDIO_CONFIG inConfig,

    const IVAS_REND_InputId id,

    RENDER_CONFIG_DATA *hRendCfg

    ,

    RENDER_CONFIG_DATA *hRendCfg,

    hrtf_handles *hrtfs



)
@@ -2861,8 +2850,7 @@ static ivas_error setRendInputActiveMasa( 
    void *input,

    const AUDIO_CONFIG inConfig,

    const IVAS_REND_InputId id,

    RENDER_CONFIG_DATA *hRendCfg

    ,

    RENDER_CONFIG_DATA *hRendCfg,

    hrtf_handles *hrtfs



    ) /* Todo: This is not used at all within MASA. Support might be better to do after refactoring. */
@@ -8663,10 +8651,8 @@ static ivas_error ivas_masa_ext_rend_parambin_init( 


static ivas_error initMasaExtRenderer(

    input_masa *inputMasa,

    const AUDIO_CONFIG outConfig

    ,

    hrtf_handles *hrtfs

)

    const AUDIO_CONFIG outConfig,

    hrtf_handles *hrtfs )

{

    int16_t i;

    ivas_error error;

lib_util/hrtf_file_reader.c

+3 −4
Original line number Diff line number Diff line
@@ -1983,8 +1983,7 @@ ivas_error create_SetOfHRTF_from_binary( 
 * Destroy the HRTF CRend handle

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



static void destroy_HRTF

    (

static void destroy_HRTF(

    HRTFS_HANDLE *hHRTF /* i/o: HRTF CRend handle */

)

{

lib_dec/lib_dec.c

+5 −5

File changed.

Contains only whitespace changes.

lib_rend/ivas_stat_rend.h

+3 −3

File changed.

Contains only whitespace changes.