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

[cleanup] code readability and whitespace

parent 4e31bf0b

lib_dec/ivas_binRenderer_internal.c

+3 −3
Original line number Diff line number Diff line
@@ -1705,13 +1705,13 @@ void ivas_binRenderer( 




                    QuatToRotMat( Quaternions_rel, Rmat_local );

                    if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 )

                    if ( hBinRenderer->hInputSetup->is_loudspeaker_setup )

                    {

                        rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, Rmat_local, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, 3 );

                        rotateFrame_sd_cldfb( Rmat_local, RealBuffer, ImagBuffer, hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, numTimeSlots, hBinRenderer->conv_band );

                    }

                    else

                    {

                        rotateFrame_sd_cldfb( Rmat_local, RealBuffer, ImagBuffer, hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, numTimeSlots, hBinRenderer->conv_band );

                        rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, Rmat_local, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, 3 );

                    }



                    ivas_binRenderer_filterModule( Cldfb_RealBuffer_Binaural[pos_idx], Cldfb_ImagBuffer_Binaural[pos_idx], RealBuffer, ImagBuffer, numTimeSlots, hBinRenderer, pos_idx );

lib_dec/ivas_dec.c

+4 −5
Original line number Diff line number Diff line
@@ -125,11 +125,10 @@ ivas_error ivas_dec( 
         ( output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

    {

#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN

        assert( ( st_ivas->ivas_format == SBA_FORMAT ||

                  st_ivas->ivas_format == MASA_FORMAT ||

                  st_ivas->ivas_format == ISM_FORMAT ||

                  st_ivas->ivas_format == MC_FORMAT ) &&

                ( output_Fs == 48000 ) && "split binaural mode is currently supported with SBA, MASA, discrete and parametric ISM, or MC formats and 48 kHz sampling rate only" );

        assert( ( st_ivas->ivas_format != UNDEFINED_FORMAT &&

                  st_ivas->ivas_format != MONO_FORMAT &&

                  st_ivas->ivas_format != STEREO_FORMAT ) &&

                ( output_Fs == 48000 ) && "split binaural mode is currently supported with SBA, MASA, ISM, or MC formats and 48 kHz sampling rate only" );

#else

        assert( ( st_ivas->ivas_format == SBA_FORMAT ||

                  st_ivas->ivas_format == MASA_FORMAT ||

lib_dec/ivas_init_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -696,6 +696,7 @@ int16_t getNumChanSynthesis( 
    return n;

}





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

 * copy_decoder_config()

 *

lib_dec/lib_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -288,12 +288,12 @@ void IVAS_DEC_Close( 
}

#ifdef SPLIT_REND_WITH_HEAD_ROT

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

 * mapAudioConfig2DecAudoioConfig()

 * mapAudioConfig2DecAudioConfig()

 *

 *

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



static IVAS_DEC_AUDIO_CONFIG mapAudioConfig2DecAudoioConfig(

static IVAS_DEC_AUDIO_CONFIG mapAudioConfig2DecAudioConfig(

    const AUDIO_CONFIG audio_config )

{

    IVAS_DEC_AUDIO_CONFIG dec_audio_config;
@@ -3352,7 +3352,7 @@ ivas_error IVAS_DEC_GetCldfbSamples( 
    num_samples = 0;

    if ( st_ivas->splitBinRend.hCldfbDataOut != NULL )

    {

        *audio_config = mapAudioConfig2DecAudoioConfig( st_ivas->splitBinRend.hCldfbDataOut->config );

        *audio_config = mapAudioConfig2DecAudioConfig( st_ivas->splitBinRend.hCldfbDataOut->config );

        if ( st_ivas->splitBinRend.hCldfbDataOut->config != AUDIO_CONFIG_INVALID )

        {

            num_chs = audioCfg2channels( st_ivas->splitBinRend.hCldfbDataOut->config );