Commit 07b86fd4 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch '1527_fix_bitrate_idx_in_CMR_Basop' into 'main' 

1527: Fix for incorrect bitrate idx reported in CMR requests

See merge request !2907
parents acb4374f fe75bbfc

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ 
#define OPTIMIZE_FFT_STACK                              /* VA: removal of intermediate FFT buffers */

#define HARMONIZE_DCT                                   /* VA: removal of duplicated DCT functions */

#define FIX_2489_HARMONIZE_FdCng_encodeSID              /* FhG: harmonize FdCng_encodeSID_fx() and FdCng_encodeSID_ivas_fx()  */

#define FIX_1527_CMR_BITRATE_IDX                        /* Fix for incorrect bitrate idx packed in rtp CMR E-byte */



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

lib_util/ivas_rtp_payload.c

+12 −0
Original line number Diff line number Diff line
@@ -657,7 +657,11 @@ static uint32_t getBitrateIdx( const uint32_t *table, uint32_t tableLen, uint32_ 


    for ( n = 0; n < tableLen; n++ )

    {

#ifdef FIX_1527_CMR_BITRATE_IDX

        if ( bitrate >= ( table[n] * IVAS_NUM_FRAMES_PER_SEC ) )

#else

        if ( bitrate > ( table[n] * IVAS_NUM_FRAMES_PER_SEC ) )

#endif

        {

            idx = n;

        }
@@ -723,7 +727,11 @@ static void packEBytes( 
            /* EVS Modes */

            bitrate = ( bitrate > 128000 ) ? 128000 : bitrate;

            bitrate = ( bitrate < 5900 ) ? 5900 : bitrate;

#ifdef FIX_1527_CMR_BITRATE_IDX

            bitrateIdx = getBitrateIdx( evsFrameSizeInBits, ( sizeof( evsFrameSizeInBits ) / sizeof( evsFrameSizeInBits[0] ) ) - 1, bitrate );

#else

            bitrateIdx = getBitrateIdx( evsFrameSizeInBits, sizeof( evsFrameSizeInBits ) / sizeof( evsFrameSizeInBits[0] ), bitrate );

#endif

            BR = (uint8_t) bitrateIdx & MASK_4BIT;



            /* If a bandwidth choice cannot be signalled for a given bitrate
@@ -787,7 +795,11 @@ static void packEBytes( 
            /* Initial E-Byte */

            bitrate = ( bitrate > 512000 ) ? 512000 : bitrate;

            bitrate = ( bitrate < 13200 ) ? 13200 : bitrate;

#ifdef FIX_1527_CMR_BITRATE_IDX

            bitrateIdx = getBitrateIdx( ivasFrameSizeInBits, ( sizeof( ivasFrameSizeInBits ) / sizeof( ivasFrameSizeInBits[0] ) ) - 2, bitrate );

#else

            bitrateIdx = getBitrateIdx( ivasFrameSizeInBits, sizeof( ivasFrameSizeInBits ) / sizeof( ivasFrameSizeInBits[0] ), bitrate );

#endif

            BR = (uint8_t) bitrateIdx & MASK_4BIT;

            if ( nByte < maxNumEBytes )

            {