Revert "Add split codec frame size signalling" (bc56e2c2) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+3 −19

Original line number	Diff line number	Diff line
		@@ -1763,12 +1763,7 @@ static ivas_error initOnFirstGoodFrame(
		splitRendBitsZero.bits_written = 0;
		splitRendBitsZero.bits_read = 0;
		if ( split_rend_write_bitstream_to_file( *hSplitRendFileReadWrite, splitRendBitsZero.bits_buf, &splitRendBitsZero.bits_read, &splitRendBitsZero.bits_written,
		-1, IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE
		#ifdef API_5MS
		,
		splitRendBitsZero.codec_frame_size_ms
		#endif
		) != IVAS_ERR_OK )
		-1, IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to write to bitstream file!\n" );
		exit( -1 );
		@@ -2026,7 +2021,6 @@ static ivas_error decodeG192(
		splitRendBits.buf_len = MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES;
		splitRendBits.codec = IVAS_SPLIT_REND_CODEC_DEFAULT;
		splitRendBits.pose_correction = IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE;
		splitRendBits.codec_frame_size_ms = 0;
		hSplitRendFileReadWrite = NULL;
		#endif

		@@ -2289,12 +2283,7 @@ static ivas_error decodeG192(
		if ( ( hSplitRendFileReadWrite != NULL ) && ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CODED ) )
		{
		if ( split_rend_write_bitstream_to_file( hSplitRendFileReadWrite, splitRendBits.bits_buf, &splitRendBits.bits_read, &splitRendBits.bits_written,
		splitRendBits.codec, splitRendBits.pose_correction
		#ifdef API_5MS
		,
		splitRendBits.codec_frame_size_ms
		#endif
		) != IVAS_ERR_OK )
		splitRendBits.codec, splitRendBits.pose_correction ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to write to bitstream file!\n" );
		goto cleanup;
		@@ -2305,12 +2294,7 @@ static ivas_error decodeG192(
		if ( ( hSplitRendFileReadWrite != NULL ) && ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_PCM ) )
		{
		if ( split_rend_write_bitstream_to_file( hSplitRendFileReadWrite, splitRendBits.bits_buf, &splitRendBits.bits_read, &splitRendBits.bits_written,
		splitRendBits.codec, splitRendBits.pose_correction
		#ifdef API_5MS
		,
		splitRendBits.codec_frame_size_ms
		#endif
		) != IVAS_ERR_OK )
		splitRendBits.codec, splitRendBits.pose_correction ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to write to bitstream file!\n" );
		goto cleanup;

apps/renderer.c

+2 −12

Original line number	Diff line number	Diff line
		@@ -1486,12 +1486,7 @@ int main(
		ivas_error error_tmp;
		numSamplesRead = (int16_t) inBufferSize;
		error_tmp = split_rend_read_bits_from_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead, &bitsBuffer.config.bitsWritten,
		&bitsBuffer.config.codec, &bitsBuffer.config.poseCorrection
		#ifdef API_5MS
		,
		&bitsBuffer.config.codec_frame_size_ms
		#endif
		);
		&bitsBuffer.config.codec, &bitsBuffer.config.poseCorrection );
		if ( error_tmp != IVAS_ERR_OK )
		{
		if ( error_tmp == IVAS_ERR_END_OF_FILE )
		@@ -1955,12 +1950,7 @@ int main(
		if ( ( hSplitRendFileReadWrite != NULL ) && is_split_pre_rend_mode( &args ) )
		{
		if ( split_rend_write_bitstream_to_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead, &bitsBuffer.config.bitsWritten,
		bitsBuffer.config.codec, bitsBuffer.config.poseCorrection
		#ifdef API_5MS
		,
		bitsBuffer.config.codec_frame_size_ms
		#endif
		) != IVAS_ERR_OK )
		bitsBuffer.config.codec, bitsBuffer.config.poseCorrection ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to write to bitstream file!\n" );
		exit( -1 );

lib_com/common_api_types.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ typedef struct ivas_split_rend_bits_t
		int32_t bits_written;
		int32_t bits_read;
		#ifdef API_5MS
		int16_t codec_frame_size_ms;
		int16_t codec_frame_size_ms; /* TODO complete implementation */
		#endif
		IVAS_SPLIT_REND_CODEC codec;
		IVAS_SPLIT_REND_POSE_CORRECTION_MODE pose_correction;

lib_dec/lib_dec.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2181,7 +2181,9 @@ static ivas_error copyRendererConfigStruct( RENDER_CONFIG_HANDLE hRCin, IVAS_REN
		hRCout->split_rend_config.dof = 3;
		hRCout->split_rend_config.hq_mode = 0;
		hRCout->split_rend_config.codec_delay_ms = 0;
		#ifdef API_5MS
		hRCout->split_rend_config.codec_frame_size_ms = 0; /* 0 means "use default for selected codec" */
		#endif
		hRCout->split_rend_config.codec = IVAS_SPLIT_REND_CODEC_DEFAULT;
		hRCout->split_rend_config.poseCorrectionMode = IVAS_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB;
		hRCout->split_rend_config.rendererSelection = hRCin->split_rend_config.rendererSelection;

lib_rend/ivas_prot_rend.h

+1 −5

Original line number	Diff line number	Diff line
		@@ -925,11 +925,7 @@ int32_t ivas_get_lcld_bitrate( const int32_t SplitRendBitRate, const IVAS_SPLIT_
		int32_t ivas_get_split_rend_md_target_brate( const int32_t SplitRendBitRate, const int16_t pcm_out );
		int32_t ivas_get_lc3plus_bitrate( const int32_t SplitRendBitRate, IVAS_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode );
		int8_t ivas_get_lc3plus_bitrate_id( const int32_t SplitRendBitRate );
		int32_t ivas_get_lc3plus_size_from_id( const int8_t SplitRendBitRateId, IVAS_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode
		#ifdef API_5MS
		,int16_t codec_frame_size_ms
		#endif
		);
		int32_t ivas_get_lc3plus_size_from_id( const int8_t SplitRendBitRateId, IVAS_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode );
		ivas_error ivas_split_rend_validate_config( const IVAS_SPLIT_REND_CONFIG_DATA *pSplitRendConfig, const int16_t is_pcm_out );
		void ivas_split_rend_get_quant_params(
		const int16_t num_md_bands,