Commit b4bf26f9 authored by sagnowski's avatar sagnowski
Browse files

Minor cleanup

parent 9bf12791

lib_dec/ivas_dirac_dec.c

+2 −3
Original line number Diff line number Diff line
@@ -1667,7 +1667,6 @@ static void binRenderer_split( 
        {

            for ( ch = 0; ch < nchan_out; ch++ )

            {



#ifdef FIX_1119_SPLIT_RENDERING_VOIP

                CLDFB_RB_Push(

                    hSplitBinRend->hMultiBinCldfbData[pos_idx * BINAURAL_CHANNELS + ch],

lib_dec/ivas_stat_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ typedef struct 
typedef struct

{

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

    float Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS][2 * CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS][2 * CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; /* Double space to account for TSM */

    float Cldfb_ImagBuffer[MAX_OUTPUT_CHANNELS][2 * CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

#else

    float Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

lib_dec/lib_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -3748,6 +3748,14 @@ ivas_error IVAS_DEC_VoIP_GetSamples 
        return IVAS_ERR_WRONG_PARAMS;

    }



#ifndef FIX_1119_SPLIT_RENDERING_VOIP

    if ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ||

         hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )

    {

        return IVAS_ERROR( IVAS_ERR_NOT_IMPLEMENTED, "Split rendering is not integrated with VoIP mode" );

    }

#endif



    /* make sure that the FIFO after decoder/scaler contains at least one sound card frame (i.e. 20ms) */

    while ( *nSamplesRendered < nSamplesPerChannel )

    {

lib_isar/isar_splitRendererPre.c

+22 −4
Original line number Diff line number Diff line
@@ -2012,11 +2012,22 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
    {

        target_md_bits = isar_get_split_rend_md_target_brate( SplitRendBitRate, pcm_out_flag ) * L_FRAME48k / 48000;



        isar_rend_CldfbSplitPreRendProcess(

            hSplitBin->hBinHrSplitPreRend,

            headPosition,

            &hSplitBin->multiBinPoseData,

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

        isar_rend_CldfbSplitPreRendProcess( hSplitBin->hBinHrSplitPreRend, headPosition, &hSplitBin->multiBinPoseData, p_Cldfb_In_BinReal, p_Cldfb_In_BinImag, pBits, target_md_bits, low_res_pre_rend_rot, ro_md_flag );

            p_Cldfb_In_BinReal,

            p_Cldfb_In_BinImag,

#else

        isar_rend_CldfbSplitPreRendProcess( hSplitBin->hBinHrSplitPreRend, headPosition, &hSplitBin->multiBinPoseData, Cldfb_In_BinReal, Cldfb_In_BinImag, pBits, target_md_bits, low_res_pre_rend_rot, ro_md_flag );

            Cldfb_In_BinReal,

            Cldfb_In_BinImag,

#endif

            pBits,

            target_md_bits,

            low_res_pre_rend_rot,

            ro_md_flag

        );

    }



    if ( pcm_out_flag == 0 )
@@ -2031,11 +2042,18 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
            pBits->codec_frame_size_ms = codec_frame_size_ms;

            pBits->isar_frame_size_ms = isar_frame_size_ms;



            isar_splitBinLCLDEncProcess(

                hSplitBin->hSplitBinLCLDEnc,

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

            isar_splitBinLCLDEncProcess( hSplitBin->hSplitBinLCLDEnc, p_Cldfb_In_BinReal, p_Cldfb_In_BinImag, available_bits, pBits );

                p_Cldfb_In_BinReal,

                p_Cldfb_In_BinImag,

#else

            isar_splitBinLCLDEncProcess( hSplitBin->hSplitBinLCLDEnc, Cldfb_In_BinReal, Cldfb_In_BinImag, available_bits, pBits );

                Cldfb_In_BinReal,

                Cldfb_In_BinImag,

#endif

                available_bits,

                pBits

            );

        }

        else

        {

lib_dec/ivas_osba_dec.c

+2 −2

File changed.

Contains only whitespace changes.