Commit bef45eff authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Run clang-format

parent 2c54435f

lib_dec/ivas_ism_renderer.c

+3 −2
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ void ivas_ism_render( 
        {

#ifdef EXTERNAL_ORIENTATIONS

            /* Combined rotation: rotate the object positions depending the head and external orientations */

            if ( st_ivas->hCombinedOrientationData != NULL && st_ivas->hCombinedOrientationData->enableCombinedOrientation[0] == 1) {

            if ( st_ivas->hCombinedOrientationData != NULL && st_ivas->hCombinedOrientationData->enableCombinedOrientation[0] == 1 )

            {

                rotateAziEle( st_ivas->hIsmMetaData[i]->azimuth, st_ivas->hIsmMetaData[i]->elevation, &azimuth, &elevation, st_ivas->hCombinedOrientationData->Rmat[0], st_ivas->hIntSetup.is_planar_setup );

#else

            /* Head rotation: rotate the object positions depending the head's orientation */

lib_rend/ivas_dirac_dec_binaural_functions.c

+33 −15
Original line number Diff line number Diff line
@@ -73,13 +73,17 @@ static void ivas_dirac_dec_binaural_internal( Decoder_Struct *st_ivas, 
#ifdef EXTERNAL_ORIENTATIONS

                                              COMBINED_ORIENTATION_HANDLE hCombinedOrientationData,

#endif

                                              float *output_f[], const int16_t nchan_transport, const int16_t subframe );

                                              float *output_f[],

                                              const int16_t nchan_transport,

                                              const int16_t subframe );

#else

static void ivas_dirac_dec_binaural_internal( Decoder_Struct *st_ivas,

#ifdef EXTERNAL_ORIENTATIONS

                                              COMBINED_ORIENTATION_HANDLE hCombinedOrientationData,

#endif

                                              float output_f[][L_FRAME48k], const int16_t nchan_transport, const int16_t subframe );

                                              float output_f[][L_FRAME48k],

                                              const int16_t nchan_transport,

                                              const int16_t subframe );

#endif

static void ivas_dirac_dec_decorrelate_slot( DIRAC_DEC_HANDLE hDirAC, const int16_t slot, float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float decRe[][CLDFB_NO_CHANNELS_MAX], float decIm[][CLDFB_NO_CHANNELS_MAX] );
@@ -96,7 +100,11 @@ static void adaptTransportSignalsHeadtracked( 
#else

    HEAD_TRACK_DATA_HANDLE hHeadTrackData,

#endif

        float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t nBins, const int16_t nSlots, float Rmat[3][3] );

    float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],

    float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],

    const int16_t nBins,

    const int16_t nSlots,

    float Rmat[3][3] );



static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked(

#ifdef EXTERNAL_ORIENTATIONS
@@ -104,7 +112,11 @@ static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( 
#else

    HEAD_TRACK_DATA_HANDLE hHeadTrackData,

#endif

        float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t nBins, const int16_t nSlots, float Rmat[3][3] );

    float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],

    float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],

    const int16_t nBins,

    const int16_t nSlots,

    float Rmat[3][3] );

#else

static void ivas_dirac_dec_binaural_process_output( Decoder_Struct *st_ivas, float output_f[][L_FRAME48k], float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t max_band_decorr, const int16_t numInChannels, const int16_t subframe );
@@ -114,7 +126,10 @@ static void adaptTransportSignalsHeadtracked( 
#else

    HEAD_TRACK_DATA_HANDLE hHeadTrackData,

#endif

        float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t nBins, float Rmat[3][3] );

    float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],

    float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],

    const int16_t nBins,

    float Rmat[3][3] );



static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked(

#ifdef EXTERNAL_ORIENTATIONS
@@ -122,7 +137,10 @@ static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( 
#else

    HEAD_TRACK_DATA_HANDLE hHeadTrackData,

#endif

        float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t nBins, float Rmat[3][3] );

    float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],

    float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],

    const int16_t nBins,

    float Rmat[3][3] );

#endif



static void formulate2x2MixingMatrix( float Ein1, float Ein2, float CinRe, float CinIm, float Eout1, float Eout2, float CoutRe, float CoutIm, float Q[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Mre[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Mim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], const float regularizationFactor );

lib_rend/ivas_rotation.c

+28 −31
Original line number Diff line number Diff line
@@ -1222,8 +1222,7 @@ ivas_error combine_external_and_head_orientations( 
void external_target_interpolation(

    EXTERNAL_ORIENTATION_HANDLE hExtOrientationData,      /* i  : external orientation handle                              */

    COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, /* i/o: combined orientation handle                              */

    const int16_t i

)

    const int16_t i )

{

    /* Sanity check for number of frames */

    hExtOrientationData->numFramesToTargetOrientation[i] = min( hExtOrientationData->numFramesToTargetOrientation[i], hCombinedOrientationData->maximumFramesToTargetOrientation );
@@ -1251,7 +1250,6 @@ void external_target_interpolation( 
        hCombinedOrientationData->isInterpolationOngoing = TRUE;

        QuaternionSlerp( hCombinedOrientationData->Quaternions_ext_interpolation_start, hCombinedOrientationData->Quaternions_ext_interpolation_target, hCombinedOrientationData->interpolationCoefficient, &hCombinedOrientationData->Quaternions[i] );

        hCombinedOrientationData->interpolationCoefficient += hCombinedOrientationData->interpolationIncrement;



    }

    else

    {
@@ -1272,8 +1270,7 @@ void external_target_interpolation( 


bool are_orientations_same(

    const IVAS_QUATERNION *orientation1,

    const IVAS_QUATERNION *orientation2

)

    const IVAS_QUATERNION *orientation2 )

{

    bool orientationsAreSame = true;

    float error_margin = 0.05f;

lib_rend/lib_rend.c

+24 −26
Original line number Diff line number Diff line
@@ -2553,7 +2553,6 @@ static DecoderDummy *initDecoderDummy( 
            assert( error == IVAS_ERR_OK );

        }

#endif



    }

    else

    {
@@ -4122,7 +4121,6 @@ ivas_error IVAS_REND_SetReferenceVector( 
}







#ifdef EXTERNAL_ORIENTATIONS

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

 * IVAS_REND_SetExternalOrientation()

lib_rend/ivas_objectRenderer.c

+17 −17

File changed.

Contains only whitespace changes.

lib_rend/ivas_stat_rend.h

+5 −5

File changed.

Contains only whitespace changes.

lib_util/rotation_file_reader.c

+13 −13

File changed.

Contains only whitespace changes.

lib_dec/ivas_binRenderer_internal.c

+2 −2

File changed.

Contains only whitespace changes.

lib_dec/lib_dec.c

+7 −7

File changed.

Contains only whitespace changes.

lib_util/rotation_file_reader.h

+13 −13

File changed.

Contains only whitespace changes.

apps/decoder.c

+2 −2

File changed.

Contains only whitespace changes.

lib_dec/ivas_dec.c

+2 −2

File changed.

Contains only whitespace changes.

lib_dec/ivas_dirac_dec.c

+4 −4

File changed.

Contains only whitespace changes.

lib_rend/ivas_crend.c

+19 −19

File changed.

Contains only whitespace changes.