[cleanup] accept FIX_1527_CMR_BITRATE_IDX (c034cfd9) · Commits · SA4 / Audio / IVAS BASOP

apps/encoder.c

+0 −18

Original line number	Diff line number	Diff line
		@@ -45,9 +45,7 @@
		#include "masa_file_reader.h"
		#include "rotation_file_reader.h"
		#include "ivas_rtp_file.h"
		#ifdef FIX_1527_CMR_BITRATE_IDX
		#include "requests_file_reader.h"
		#endif
		#include "wmc_auto.h"


		@@ -168,9 +166,7 @@ typedef struct
		char *sceneOrientationTrajFileName;
		char *deviceOrientationTrajFileName;

		#ifdef FIX_1527_CMR_BITRATE_IDX
		char *requestsFileName;
		#endif
		} EncArguments;


		@@ -227,9 +223,7 @@ int main(
		uint8_t au[IVAS_MAX_BITS_PER_FRAME / 8];
		IVAS_RTP ivasRtp = { 0 };

		#ifdef FIX_1527_CMR_BITRATE_IDX
		ReqFileReader *requestsFileReader = NULL;
		#endif
		/* Ideally ssrc is negotiated via SDP and sequence number is radomized but we
		use fixed seed for random num generator for regression based tests. Any realtime
		application should implement this initialization seperately */
		@@ -667,7 +661,6 @@ int main(
		}
		}

		#ifdef FIX_1527_CMR_BITRATE_IDX
		/------------------------------------------------------------------------------------------
		* Open remote requests file for rtp packing (E-bytes)
		------------------------------------------------------------------------------------------/
		@@ -679,7 +672,6 @@ int main(
		goto cleanup;
		}
		}
		#endif

		/------------------------------------------------------------------------------------------
		* Run the encoder
		@@ -890,7 +882,6 @@ int main(
		}
		}

		#ifdef FIX_1527_CMR_BITRATE_IDX
		if ( requestsFileReader )
		{
		if ( ( error = ReadNextRequests( requestsFileReader, ivasRtp.remoteRequests, &ivasRtp.remoteRequestBitmap ) ) != IVAS_ERR_OK )
		@@ -899,7 +890,6 @@ int main(
		goto cleanup;
		}
		}
		#endif

		if ( ( error = IVAS_ENC_EncodeFrameToCompact( hIvasEnc, pcmBuf, pcmBufSize, au, &numBits ) ) != IVAS_ERR_OK )
		{
		@@ -996,12 +986,10 @@ cleanup:
		fclose( f_bitrateProfile );
		}

		#ifdef FIX_1527_CMR_BITRATE_IDX
		if ( requestsFileReader )
		{
		RequestsFileReader_close( &requestsFileReader );
		}
		#endif

		if ( sceneOrientationFileReader )
		{
		@@ -1049,9 +1037,7 @@ static bool parseCmdlIVAS_enc(
		/-----------------------------------------------------------------
		* Set default values
		-----------------------------------------------------------------/
		#ifdef FIX_1527_CMR_BITRATE_IDX
		memset( arg, 0, sizeof( *arg ) );
		#endif

		arg->inputWavFilename = NULL;
		arg->outputBitstreamFilename = NULL;
		@@ -1918,7 +1904,6 @@ static bool parseCmdlIVAS_enc(
		arg->deviceOrientationTrajFileName = argv[i];
		i++;
		}
		#ifdef FIX_1527_CMR_BITRATE_IDX
		else if ( strcmp( argv_to_upper, "-REQUESTS" ) == 0 )
		{
		i++;
		@@ -1931,7 +1916,6 @@ static bool parseCmdlIVAS_enc(
		arg->requestsFileName = argv[i];
		i++;
		}
		#endif

		/-----------------------------------------------------------------
		* Option not recognized
		@@ -2151,9 +2135,7 @@ static void usage_enc( void )
		fprintf( stdout, " EVS RTP Payload Format is used. Optional N represents number of frames per RTP packet\n" );
		fprintf( stdout, "-scene_orientation : Scene orientation trajectory file. Only used with rtpdump output.\n" );
		fprintf( stdout, "-device_orientation : Device orientation trajectory file. Only used with rtpdump output.\n" );
		#ifdef FIX_1527_CMR_BITRATE_IDX
		fprintf( stdout, "-requests : Remote requests file, Only used with rtpdump output.\n" );
		#endif

		fprintf( stdout, "\n" );

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,6 @@
		#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */
		#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527 /* Fix crash from issue #2527 */
		#define FIX_FLOAT_1539_G192_FORMAT_SWITCH /* VA/Nokia: reintroduce format switching for g192 bitstreams */
		#define FIX_1527_CMR_BITRATE_IDX /* Fix for incorrect bitrate idx packed in rtp CMR E-byte */
		#define HARMONIZE_2494_FdCng_decodeSID_fx /* FhG: harmonize FdCng_decodeSID_fx with _ivas_ version */
		#define FIX_BASOP_2509_EVS_CONCEAL_UNINIT_MEM /* FhG: BASOP 2509: st->hTcxCfg->psychParamsCurrent is not initialized */
		#define HARMONIZE_2499_CONFIGUREFDCNGDEC /* FhG: basop issue 2499: harmonoize configureFdCngDec */

lib_util/ivas_rtp_file.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1086,7 +1086,6 @@ ivas_error IVAS_RTP_WriteNextFrame(
		rtp->nWrittenPiData--;
		}

		#ifdef FIX_1527_CMR_BITRATE_IDX
		for ( IVAS_RTP_REQUEST_TYPE req = 0; req < IVAS_REQUEST_MAX; req++ )
		{
		if ( rtp->remoteRequestBitmap & ( 1u << req ) )
		@@ -1098,7 +1097,6 @@ ivas_error IVAS_RTP_WriteNextFrame(
		}
		}
		}
		#endif

		if ( forcePacket \|\| IVAS_RTP_PACK_GetNumFrames( rtp->hPack ) == rtp->packCfg.maxFramesPerPacket )
		{

lib_util/ivas_rtp_file.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -44,9 +44,7 @@ typedef struct
		uint8_t packet[NOMINAL_BUFFER_SIZE( IVAS_MAX_FRAMES_PER_RTP_PACKET )];
		IVAS_PIDATA_TS piData[IVAS_PI_MAX_ID * IVAS_MAX_FRAMES_PER_RTP_PACKET];

		#ifdef FIX_1527_CMR_BITRATE_IDX
		IVAS_RTP_REQUEST_VALUE remoteRequests[IVAS_REQUEST_MAX];
		#endif
		IVAS_RTP_FILE_HANDLE hRtpFile;
		FILE *f_piDataOut;
		FILE *f_piExtOut;

lib_util/ivas_rtp_payload.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -657,11 +657,7 @@ 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;
		}
		@@ -727,11 +723,7 @@ 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
		@@ -795,11 +787,7 @@ 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 )
		{