Commit ff9e6f52 authored by sagnowski's avatar sagnowski
Browse files

Update preprocessor switch name

parent f11560a1

apps/decoder.c

+2 −2
Original line number Diff line number Diff line
@@ -3897,13 +3897,13 @@ static ivas_error decodeVoIP( 
        }

        else if ( decodedGoodFrame )

        {

#ifdef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifdef FIX_1515_ISAR_FRAME_SIZES_IN_RTP

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

#else

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

#endif

            srInfo.codec = ( splitRendBits->codec == ISAR_SPLIT_REND_CODEC_LC3PLUS ) ? IVAS_SR_TRANSPORT_LC3PLUS : IVAS_SR_TRANSPORT_LCLD;

#ifdef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifdef FIX_1515_ISAR_FRAME_SIZES_IN_RTP

            srInfo.codecFrameSizeMs = (uint32_t) splitRendBits->isar_frame_size_ms;

#else

            srInfo.codecFrameSizeMs = (uint32_t) splitRendBits->codec_frame_size_ms;

apps/isar_post_rend.c

+3 −3
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static ivas_error parseSRParamsFile( 
                *codec = ( srInfo.codec == IVAS_SR_TRANSPORT_LCLD ) ? ISAR_SPLIT_REND_CODEC_LCLD : ISAR_SPLIT_REND_CODEC_LC3PLUS;

                *codec_frame_size_ms = (int16_t) srInfo.codecFrameSizeMs;

                *isar_frame_size_ms = *codec_frame_size_ms; /* for rtp force codec framesize as isar renderer frame size */

#ifdef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifdef FIX_1515_ISAR_FRAME_SIZES_IN_RTP

                if ( *codec == ISAR_SPLIT_REND_CODEC_LC3PLUS && *isar_frame_size_ms == 20 )

                {

                    /* For LC3plus, the codec frame size is limited to max 10 ms */
@@ -1201,7 +1201,7 @@ int main( 
            bitsBuffer.config.bitsRead = 0;

            bitsBuffer.config.bitsWritten = 0;



#ifdef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifdef FIX_1515_ISAR_FRAME_SIZES_IN_RTP

            while ( frameMS < (int16_t) ( args.render_num_subframes * 5 ) )

#else

            while ( frameMS < bitsBuffer.config.isar_frame_size_ms )
@@ -1231,7 +1231,7 @@ int main( 
                bitBuffer += ( auSizeBits + 7 ) / 8;

                bitsBuffer.config.bitsWritten += auSizeBits;

                bitsBuffer.config.codec = srInfo.codec == IVAS_SR_TRANSPORT_LC3PLUS ? ISAR_SPLIT_REND_CODEC_LC3PLUS : ISAR_SPLIT_REND_CODEC_LCLD;

#ifdef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifdef FIX_1515_ISAR_FRAME_SIZES_IN_RTP

                frameMS += bitsBuffer.config.isar_frame_size_ms;

#else

                frameMS += bitsBuffer.config.codec_frame_size_ms;

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ 
#define FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN            /* FhG: float issue 1560: Avoid optimizing the division on the result of maxWithSign() with -funsafe-math-optimizations */

#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD          /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */

#define FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE         /* Fhg: Allow dynamic reconfiguration of the LC3plus Decoder when bitstream format changes */

#define FIX_1515_ISAR_FRAME_SIZES_IN_RTP                /* FhG: Fix ISAR frame sizes in RTP. This includes reconfiguration of the LC3plus decoder */



/* #################### End BE switches ################################## */

lib_isar/isar_lc3plus_dec.c

+6 −6
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include "wmc_auto.h"





#ifdef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifdef FIX_1515_ISAR_FRAME_SIZES_IN_RTP /* "open" and "close" were refactored (mostly copy-paste) into separate steps of (de)allocate handle and (de)init handle */

static ivas_error isar_lc3plus_dec_init_handle(

    const LC3PLUS_CONFIG config,    /* i  : LC3plus decoder configuration   */

    ISAR_LC3PLUS_DEC_HANDLE *handle /* o  : decoder handle                  */
@@ -432,7 +432,7 @@ ivas_error ISAR_LC3PLUS_DEC_GetDelay( 
}





#ifdef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifdef FIX_1515_ISAR_FRAME_SIZES_IN_RTP

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

 * ISAR_LC3PLUS_DEC_Close()

 *
@@ -565,7 +565,7 @@ static ivas_error isar_LC3PLUS_DEC_Decode_or_Conceal_internal( 
    int32_t ivasSampleIndex;

    int16_t numSamplesPerLC3plusChannel;

    ivas_error err;

#ifdef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifdef FIX_1515_ISAR_FRAME_SIZES_IN_RTP

    bool reInitRequired = false;

#endif
@@ -595,7 +595,7 @@ static ivas_error isar_LC3PLUS_DEC_Decode_or_Conceal_internal( 
        return IVAS_ERROR( IVAS_ERR_NOT_IMPLEMENTED, "isar_frame_duration_us must be equal or multiple of lc3plus_frame_duration_us \n" );

    }



#ifndef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifndef FIX_1515_ISAR_FRAME_SIZES_IN_RTP

    config_num_media_times = handle->config.isar_frame_duration_us / handle->config.lc3plus_frame_duration_us;

#endif

    if ( !badFrameIndicator )
@@ -612,7 +612,7 @@ static ivas_error isar_LC3PLUS_DEC_Decode_or_Conceal_internal( 
        {

            return IVAS_ERROR( IVAS_ERR_NOT_IMPLEMENTED, "LC3plus config change (number of channels) in bitstream is not supported\n" );

        }

#ifdef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifdef FIX_1515_ISAR_FRAME_SIZES_IN_RTP

        if ( payload.frame_duration_us != handle->config.lc3plus_frame_duration_us )

        {

            if (payload.num_media_times * payload.frame_duration_us == handle->config.isar_frame_duration_us)
@@ -655,7 +655,7 @@ static ivas_error isar_LC3PLUS_DEC_Decode_or_Conceal_internal( 
#endif

    }



#ifdef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifdef FIX_1515_ISAR_FRAME_SIZES_IN_RTP

    if (reInitRequired)

    {

        isar_lc3plus_dec_deinit_handle( handle );

lib_isar/lib_isar_pre_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 
            available_bits = ( SplitRendBitRate * hSplitBin->hSplitBinLCLDEnc->iNumBlocks * hSplitBin->hSplitBinLCLDEnc->iNumIterations ) / ( 16 * FRAMES_PER_SEC );

            available_bits -= pBits->bits_written;

            pBits->codec_frame_size_ms = codec_frame_size_ms;

#ifdef FIX_1234_SPLIT_REND_LC3PLUS_RECONFIGURE

#ifdef FIX_1515_ISAR_FRAME_SIZES_IN_RTP

            pBits->isar_frame_size_ms = isar_frame_size_ms;

#endif

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