Commit 4a5a7386 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

set codec_frame_size and isar_frame_size at one place

parent 3140b864

apps/decoder.c

+8 −1
Original line number Diff line number Diff line
@@ -3771,7 +3771,14 @@ static ivas_error decodeVoIP( 
        else if ( decodedGoodFrame )

        {

#ifdef FIX_RENDER_FRAME_SIZE_IN_RTP_SR

            if ( splitRendBits->codec == ISAR_SPLIT_REND_CODEC_LCLD )

            {

                srInfo.bitrateKbps = splitRendBits->bits_written * 1000 / splitRendBits->codec_frame_size_ms;

            }

            else

            {

                srInfo.bitrateKbps = splitRendBits->bits_written * 1000 / splitRendBits->isar_frame_size_ms;

            }

#else

            srInfo.bitrateKbps = splitRendBits->bits_written * 1000 / splitRendBits->codec_frame_size_ms;

#endif

lib_isar/isar_splitRendererPre.c

+2 −0
Original line number Diff line number Diff line
@@ -1858,8 +1858,10 @@ ivas_error splitRendLc3plusEncodeAndWrite( 
    pBits->bits_written += 8 * lc3plusBitstreamSize;

    pBits->codec = ISAR_SPLIT_REND_CODEC_LC3PLUS;

    pBits->pose_correction = hSplitBin->multiBinPoseData.poseCorrectionMode;

#ifndef FIX_RENDER_FRAME_SIZE_IN_RTP_SR

    pBits->codec_frame_size_ms = (int16_t) ( hSplitBin->hLc3plusEnc->config.lc3plus_frame_duration_us / 1000 );

    pBits->isar_frame_size_ms = (int16_t) ( hSplitBin->hLc3plusEnc->config.isar_frame_duration_us / 1000 );

#endif

    pBits->lc3plus_highres = hSplitBin->hLc3plusEnc->config.high_res_mode_enabled;



    return IVAS_ERR_OK;

lib_isar/lib_isar_pre_rend.c

+7 −0
Original line number Diff line number Diff line
@@ -329,12 +329,18 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 
    {

        pBits->codec = splitCodec;

        pBits->pose_correction = hSplitBin->multiBinPoseData.poseCorrectionMode;

#ifdef FIX_RENDER_FRAME_SIZE_IN_RTP_SR

        pBits->codec_frame_size_ms = codec_frame_size_ms;

        pBits->isar_frame_size_ms = isar_frame_size_ms;

#endif



        if ( splitCodec == ISAR_SPLIT_REND_CODEC_LCLD )

        {

            available_bits = ( SplitRendBitRate * hSplitBin->hSplitBinLCLDEnc->iNumBlocks * hSplitBin->hSplitBinLCLDEnc->iNumIterations ) / ( 16 * FRAMES_PER_SEC );

            available_bits -= pBits->bits_written;

#ifndef FIX_RENDER_FRAME_SIZE_IN_RTP_SR

            pBits->codec_frame_size_ms = codec_frame_size_ms;

#endif

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

        }

        else
@@ -342,6 +348,7 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 
            int16_t ch, slot_idx, num_slots, ivas_fs;

            ivas_fs = (int16_t) hSplitBin->hLc3plusEnc->config.isar_frame_duration_us / 1000;

            num_slots = (int16_t) ( CLDFB_NO_COL_MAX * ivas_fs ) / 20;



            /* CLDFB synthesis of main pose */

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

            {