formatting, correct comments (a9dc7899) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -875,6 +875,7 @@ int main(
		convert_backslash( args.splitRendBFIFilePath );
		SplitRendBFIFileReader_open( args.splitRendBFIFilePath, &splitRendBFIReader );
		}

		#endif
		if ( !isEmptyString( args.externalOrientationFilePath ) )
		{
		@@ -1062,9 +1063,8 @@ int main(
		fprintf( stderr, "\nExternal Renderer Config is only supported for binaural output configurations. Exiting. \n" );
		exit( -1 );
		}
		#endif


		#endif
		if ( ( error = IVAS_REND_GetRenderConfig( hIvasRend, &renderConfig ) ) != IVAS_ERR_OK )
		{
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		@@ -1108,8 +1108,8 @@ int main(
		#endif
		exit( -1 );
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT

		if ( !is_split_post_rend_mode( &args ) )
		{
		CLDFBframeSize_smpls = frameSize_smpls * 2;
		@@ -1420,8 +1420,8 @@ int main(
		exit( -1 );
		}
		}
		#endif

		#endif
		if ( AudioFileWriter_open( &audioWriter, args.outputFilePath, args.sampleRate, numOutChannels ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to open file: %s\n", args.outputFilePath );
		@@ -1788,6 +1788,7 @@ int main(
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}

		IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.masaBuses[i].inputChannelIndex, numChannels );

		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, masaIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		@@ -1830,7 +1831,6 @@ int main(
		#endif
		}


		#ifdef SPLIT_REND_WITH_HEAD_ROT
		for ( i = 0; i < args.inConfig.numBinBuses; ++i )
		{
		@@ -1856,9 +1856,7 @@ int main(
		}
		}
		}
		#endif

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( args.inConfig.numBinBuses != 0 )
		{
		if ( ( error = IVAS_REND_GetSplitBinauralSamples( hIvasRend, outBuffer, &splitBinNeedsNewFrame ) ) != IVAS_ERR_OK )
		@@ -1987,6 +1985,7 @@ int main(
		numInputFormats++;
		inputType1 = IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS;
		}

		if ( args.inConfig.numMultiChannelBuses > 0 )
		{
		numInputFormats++;
		@@ -1995,6 +1994,7 @@ int main(
		inputType1 = IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED;
		}
		}

		if ( args.inConfig.numMasaBuses > 0 )
		{
		numInputFormats++;
		@@ -2003,6 +2003,7 @@ int main(
		inputType1 = IVAS_REND_AUDIO_CONFIG_TYPE_MASA;
		}
		}

		if ( args.inConfig.numAudioObjects > 0 )
		{
		numInputFormats++;
		@@ -2097,7 +2098,6 @@ int main(
		}
		#endif


		if ( args.inConfig.numAudioObjects != 0 && ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL \|\| args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		{
		fprintf( stdout, "\n\nMetadata delayed %d subframes\n\n", (int16_t) round( args.syncMdDelay / ( 1000 / IVAS_NUM_FRAMES_PER_SEC / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) ) );
		@@ -2391,7 +2391,6 @@ static bool parseDiegeticPan(
		return true;
		}


		#ifdef NONBE_UNIFIED_DECODING_PATHS
		static bool parseRenderFramesize(
		char *value,
		@@ -2422,8 +2421,8 @@ static bool parseRenderFramesize(

		return true;
		}
		#endif

		#endif
		static bool parseOrientationTracking(
		char *value,
		int8_t *orientation_tracking )
		@@ -3400,7 +3399,6 @@ static void parseObjectPosition(
		int16_t read_values;
		float meta_prm[8] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f };


		readNextMetadataChunk( line, "," );
		*positionDuration = (uint16_t) strtol( line, &endptr, 10 );
		readNextMetadataChunk( line, "\n" );
		@@ -3801,7 +3799,8 @@ static void parseSceneDescriptionFile(
		return;
		}

		static void printSupportedAudioConfigs( void )
		static void printSupportedAudioConfigs(
		void )
		{
		uint16_t i;
		const char *supportedFormats[] = {
		@@ -3997,6 +3996,7 @@ static void convertInputBuffer(
		return;
		}


		/--------------------------------------------------------------------------
		* convertOutputBuffer()
		*

lib_dec/ivas_dirac_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -843,13 +843,13 @@ ivas_error ivas_dirac_dec_config(
		if ( !sparfoa_flag )
		{
		common_rend_config_flag = st_ivas->hSpatParamRendCom == NULL ? DIRAC_OPEN : flag_config_inp;

		#ifdef NONBE_FIX_225_MASA_EXT_REND
		if ( ( error = ivas_spat_hSpatParamRendCom_config( &st_ivas->hSpatParamRendCom, common_rend_config_flag, dec_param_estim_new,
		st_ivas->ivas_format, st_ivas->mc_mode, output_Fs, hodirac_flag, 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_spat_hSpatParamRendCom_config( &st_ivas->hSpatParamRendCom, common_rend_config_flag, dec_param_estim_new,
		st_ivas->ivas_format, st_ivas->mc_mode, output_Fs, hodirac_flag ) ) != IVAS_ERR_OK )

		#endif
		{
		return error;

lib_dec/ivas_jbm_dec.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -1523,7 +1523,7 @@ ivas_error ivas_dec_render(


		/--------------------------------------------------------------------------
		* ivas_jbm_dec_dec_flush_renderer()
		* ivas_jbm_dec_flush_renderer()
		*
		* Flush samples if renderer granularity changes on a bitrate change
		--------------------------------------------------------------------------/
		@@ -1917,7 +1917,7 @@ void ivas_jbm_dec_get_adapted_subframes(


		/--------------------------------------------------------------------------
		* ivas_jbm_dec_get_adapted_linear_interpolator()
		* ivas_jbm_dec_get_md_map()
		*
		* Get an meta data map adapted to a time scale modified IVAS frame
		--------------------------------------------------------------------------/
		@@ -2156,6 +2156,7 @@ int16_t ivas_jbm_dec_get_num_tc_channels(
		{
		num_tc++;
		}

		if ( st_ivas->hOutSetup.separateChannelEnabled && ( output_config == IVAS_AUDIO_CONFIG_5_1 \|\| output_config == IVAS_AUDIO_CONFIG_7_1 \|\|
		output_config == IVAS_AUDIO_CONFIG_5_1_4 \|\| output_config == IVAS_AUDIO_CONFIG_7_1_4 \|\|
		output_config == IVAS_AUDIO_CONFIG_5_1_2 \|\| ( output_config == IVAS_AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe > 0 ) ) )
		@@ -2789,8 +2790,8 @@ void ivas_jbm_dec_copy_tc_no_tsm(
		assert( 0 && "Residual (direct CLDFB transport channels) only possible for ParamMC/ParamISM!" );
		}
		#endif
		/* CLDFB Analysis*/

		/* CLDFB Analysis*/
		for ( cldfb_ch = 0; cldfb_ch < n_ch_cldfb; cldfb_ch++, ch_idx++ )
		{
		for ( slot_idx = 0; slot_idx < DEFAULT_JBM_CLDFB_TIMESLOTS; slot_idx++ )

lib_dec/ivas_rom_dec.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -378,8 +378,8 @@ const uint16_t * const sym_freq_ECSQ_tab_abs_lsbs[1 + 4] =
		/----------------------------------------------------------------------------------
		* DirAC ROM tables
		----------------------------------------------------------------------------------/

		#ifndef NONBE_FIX_225_MASA_EXT_REND

		const float ls_azimuth_4d4[8] = { 45.0f, -45.0f, 135.0f, -135.0f, 45.0f, -45.0f, 135.0f, -135.0f };

		const float ls_elevation_4d4[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 35.0f, 35.0f, 35.0f, 35.0f };
		@@ -389,7 +389,6 @@ const float diffuse_response_CICP6[5] = { 0.4219f, 0.4219f, 0.3704f, 0.5034f, 0.
		const float diffuse_response_CICP14[7] = { 0.3817f, 0.3817f, 0.2819f, 0.5399f, 0.5399f, 0.1519f, 0.1519f };

		const float diffuse_response_CICP16[9] = { 0.3456f, 0.3456f, 0.3035f, 0.4124f, 0.4124f, 0.2702f, 0.2702f, 0.3023f, 0.3023f };

		#endif

		const float dirac_dithering_azi_scale[DIRAC_DIFFUSE_LEVELS] =
		@@ -532,8 +531,8 @@ const int16_t sba_map_tc_512[11] =
		0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15
		};


		#endif

		/----------------------------------------------------------------------------------
		* FASTCONV and PARAMETRIC binaural renderer ROM tables
		----------------------------------------------------------------------------------/

lib_enc/ivas_spar_encoder.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ ivas_error ivas_spar_enc(
		/* Write SBA planar flag */
		push_indice( st0->hBstr, IND_SMODE, hEncoderConfig->sba_planar, SBA_PLANAR_BITS );

		/* hack to indicate OSBA bitstream at VLBR */
		/* hack to indicate OSBA bitstream at lowest bitrates */
		push_indice( st0->hBstr, IND_SMODE, 0, SBA_ORDER_BITS );
		}
		else