remove extra frame argument under DBG_BITSTRREAM_ANALYSIS (e1c60fb0) · Commits · SA4 / Audio / IVAS BASOP

apps/encoder.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -785,12 +785,7 @@ int main(
		}

		/* * Encode one frame * */
		if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits
		#ifdef DBG_BITSTREAM_ANALYSIS
		,
		frame
		#endif
		) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nencodeFrame failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;

lib_com/bitstream.c

+2 −20

Original line number	Diff line number	Diff line
		@@ -3388,10 +3388,6 @@ static ivas_error write_indices_element(
		uint16_t *pt_stream, / i : pointer to bitstream buffer */
		const int16_t is_SCE, /* i : flag to distingusih SCE and CPE */
		const int16_t element_id /* i : id of the SCE or CPE */
		#ifdef DBG_BITSTREAM_ANALYSIS
		,
		int32_t frame
		#endif
		)
		{
		int16_t ch;
		@@ -3625,10 +3621,6 @@ ivas_error write_indices_ivas(
		Encoder_Struct st_ivas, / i/o: encoder state structure */
		uint16_t bit_stream, / i/o: output bitstream */
		uint16_t num_bits / i : number of indices written to output */
		#ifdef DBG_BITSTREAM_ANALYSIS
		,
		int32_t frame
		#endif
		)
		{
		int16_t i, n;
		@@ -3694,22 +3686,12 @@ ivas_error write_indices_ivas(

		for ( n = 0; n < st_ivas->nSCE; n++ )
		{
		write_indices_element( st_ivas, &pt_stream, 1, n
		#ifdef DBG_BITSTREAM_ANALYSIS
		,
		frame
		#endif
		);
		write_indices_element( st_ivas, &pt_stream, 1, n );
		}

		for ( n = 0; n < st_ivas->nCPE; n++ )
		{
		write_indices_element( st_ivas, &pt_stream, 0, n
		#ifdef DBG_BITSTREAM_ANALYSIS
		,
		frame
		#endif
		);
		write_indices_element( st_ivas, &pt_stream, 0, n );
		}

		*num_bits = (uint16_t) ( pt_stream - bit_stream );

lib_com/prot.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -589,10 +589,6 @@ ivas_error write_indices_ivas(
		Encoder_Struct st_ivas, / i/o: encoder state structure */
		uint16_t bit_stream, / i/o: output bitstream */
		uint16_t num_bits / i/o: number of bits written to output */
		#ifdef DBG_BITSTREAM_ANALYSIS
		,
		int32_t frame
		#endif
		);

		Word16 rate2EVSmode(

lib_enc/ivas_qmetadata_enc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1290,7 +1290,7 @@ void reset_metadata_spatial(
		#endif
		hMetaData->nb_bits_tot += hMetaData->ind_list[j].nb_bits;
		hMetaData->ind_list[i].nb_bits = -1;
		#ifdef BISTREAM_ANALYSIS
		#ifdef DBG_BITSTREAM_ANALYSIS
		sprintf( hMetaData->ind_list[i].function_name, "RESET in reset_metadata_spatial" );
		#endif
		}

lib_enc/lib_enc.c

+2 −20

Original line number	Diff line number	Diff line
		@@ -1143,10 +1143,6 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
		int16_t inputBufferSize, /* i : total number of samples in the input buffer. Related function: IVAS_ENC_GetInputBufferSize() */
		uint16_t outputBitStream, / o : pointer to serial output bitstream. The array must already be allocated and be of size at least IVAS_MAX_BITS_PER_FRAME */
		uint16_t numOutBits / o : number of bits written to output bitstream. Each bit is stored as a single uint16_t value */
		#ifdef DBG_BITSTREAM_ANALYSIS
		,
		int32_t frame
		#endif
		)
		{
		Encoder_Struct *st_ivas;
		@@ -1352,12 +1348,7 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
		}

		/* write indices into bitstream buffer */
		write_indices_ivas( st_ivas, outputBitStream, numOutBits
		#ifdef DBG_BITSTREAM_ANALYSIS
		,
		frame
		#endif
		);
		write_indices_ivas( st_ivas, outputBitStream, numOutBits );

		/* Reset switching flag before next call - can be set to "true" by some setters */
		hIvasEnc->switchingActive = false;
		@@ -1378,21 +1369,12 @@ ivas_error IVAS_ENC_EncodeFrameToCompact(
		const int16_t inputBufferSize, /* i : total number of samples in the input buffer. Related function: IVAS_ENC_GetInputBufferSize() */
		uint8_t outputBitStream, / o : pointer to compact output bitstream. The array must already be allocated. */
		uint16_t numOutBits / o : number of bits written to output bitstream */
		#ifdef DBG_BITSTREAM_ANALYSIS
		,
		int32_t frame
		#endif
		)
		{
		ivas_error error;
		uint16_t bitstream[IVAS_MAX_BITS_PER_FRAME];

		if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, inputBuffer, inputBufferSize, bitstream, numOutBits
		#ifdef DBG_BITSTREAM_ANALYSIS
		,
		frame
		#endif
		) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, inputBuffer, inputBufferSize, bitstream, numOutBits ) ) != IVAS_ERR_OK )
		{
		return error;
		}