add more instances of FIX_FLOAT_1539_G192_FORMAT_SWITCH (83d01396) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/encoder.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -885,6 +885,8 @@ int main(
		goto cleanup;
		}

		if ( frame >= 50 && frame < 60 )
		{
		/* write bitstream */
		if ( ( error = BS_Writer_WriteFrame_short( hBsWriter, bitStream, numBits, totalBitrate ) ) != IVAS_ERR_OK )
		{
		@@ -892,6 +894,7 @@ int main(
		goto cleanup;
		}
		}
		}

		frame++;
		if ( !arg.quietModeEnabled )

lib_dec/ivas_init_dec.c

+41 −0

Original line number	Diff line number	Diff line
		@@ -131,11 +131,14 @@ ivas_error ivas_dec_get_format(
		!( st_ivas->ivas_format == MASA_FORMAT && st_ivas->last_ivas_format == MASA_ISM_FORMAT ) &&
		!( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->last_ivas_format == MASA_FORMAT ) )
		{
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( Opt_tsm )
		{
		#endif
		st_ivas->restartNeeded = 1;

		return IVAS_ERR_OK;
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		}
		else
		{
		@@ -144,6 +147,7 @@ ivas_error ivas_dec_get_format(
		#endif
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Wrong number of objects signalled!" );
		}
		#endif
		}

		/-------------------------------------------------------------------
		@@ -177,11 +181,14 @@ ivas_error ivas_dec_get_format(

		if ( st_ivas->ini_frame > 0 && nchan_ism != st_ivas->nchan_ism )
		{
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( Opt_tsm )
		{
		#endif
		st_ivas->restartNeeded = 1;

		return IVAS_ERR_OK;
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		}
		else
		{
		@@ -190,6 +197,7 @@ ivas_error ivas_dec_get_format(
		#endif
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Wrong number of objects signalled!" );
		}
		#endif
		}

		st_ivas->nchan_ism = nchan_ism;
		@@ -209,10 +217,14 @@ ivas_error ivas_dec_get_format(

		if ( st_ivas->ini_frame > 0 && sba_planar != st_ivas->sba_planar )
		{
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( Opt_tsm )
		{
		#endif
		st_ivas->restartNeeded = 1;

		return IVAS_ERR_OK;
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		}
		else
		{
		@@ -221,6 +233,7 @@ ivas_error ivas_dec_get_format(
		#endif
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Wrong SBA planar flag signalled!" );
		}
		#endif
		}

		/* read Ambisonic (SBA) order */
		@@ -229,11 +242,14 @@ ivas_error ivas_dec_get_format(

		if ( st_ivas->ini_frame > 0 && sba_order != st_ivas->sba_order )
		{
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( Opt_tsm )
		{
		#endif
		st_ivas->restartNeeded = 1;

		return IVAS_ERR_OK;
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		}
		else
		{
		@@ -242,6 +258,7 @@ ivas_error ivas_dec_get_format(
		#endif
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Wrong SBA order signalled!" );
		}
		#endif
		}

		sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, sba_order );
		@@ -305,11 +322,14 @@ ivas_error ivas_dec_get_format(

		if ( st_ivas->ini_frame > 0 && nchan_ism != st_ivas->nchan_ism )
		{
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( Opt_tsm )
		{
		#endif
		st_ivas->restartNeeded = 1;

		return IVAS_ERR_OK;
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		}
		else
		{
		@@ -318,6 +338,7 @@ ivas_error ivas_dec_get_format(
		#endif
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Wrong number of objects signalled!" );
		}
		#endif
		}

		st_ivas->nchan_ism = nchan_ism;
		@@ -332,11 +353,14 @@ ivas_error ivas_dec_get_format(

		if ( st_ivas->ini_frame > 0 && nchan_ism != st_ivas->nchan_ism )
		{
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( Opt_tsm )
		{
		#endif
		st_ivas->restartNeeded = 1;

		return IVAS_ERR_OK;
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		}
		else
		{
		@@ -345,6 +369,7 @@ ivas_error ivas_dec_get_format(
		#endif
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Wrong number of objects signalled!" );
		}
		#endif
		}

		st_ivas->nchan_ism = nchan_ism;
		@@ -356,11 +381,14 @@ ivas_error ivas_dec_get_format(

		if ( st_ivas->ini_frame > 0 && nchan_ism != st_ivas->nchan_ism )
		{
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( Opt_tsm )
		{
		#endif
		st_ivas->restartNeeded = 1;

		return IVAS_ERR_OK;
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		}
		else
		{
		@@ -369,6 +397,7 @@ ivas_error ivas_dec_get_format(
		#endif
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Wrong number of objects signalled!" );
		}
		#endif
		}

		st_ivas->nchan_ism = nchan_ism;
		@@ -392,11 +421,14 @@ ivas_error ivas_dec_get_format(

		if ( st_ivas->ini_frame > 0 && sba_order != st_ivas->sba_order )
		{
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( Opt_tsm )
		{
		#endif
		st_ivas->restartNeeded = 1;

		return IVAS_ERR_OK;
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		}
		else
		{
		@@ -405,6 +437,7 @@ ivas_error ivas_dec_get_format(
		#endif
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Wrong SBA order signalled!" );
		}
		#endif
		}

		st_ivas->ism_mode = ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism );
		@@ -429,11 +462,14 @@ ivas_error ivas_dec_get_format(

		if ( st_ivas->ini_frame > 0 && st_ivas->transport_config != signaled_config )
		{
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( Opt_tsm )
		{
		#endif
		st_ivas->restartNeeded = 1;

		return IVAS_ERR_OK;
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		}
		else
		{
		@@ -442,6 +478,7 @@ ivas_error ivas_dec_get_format(
		#endif
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "wrong MC configuration signalled!" );
		}
		#endif
		}

		st_ivas->mc_mode = ivas_mc_mode_select( ivas_mc_map_output_config_to_mc_ls_setup( signaled_config ), ivas_total_brate );
		@@ -523,11 +560,14 @@ ivas_error ivas_dec_get_format(

		if ( st_ivas->ini_frame > 0 && nchan_ism != st_ivas->nchan_ism )
		{
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( Opt_tsm )
		{
		#endif
		st_ivas->restartNeeded = 1;

		return IVAS_ERR_OK;
		#ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		}
		else
		{
		@@ -536,6 +576,7 @@ ivas_error ivas_dec_get_format(
		#endif
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Wrong number of objects signalled!" );
		}
		#endif
		}

		st_ivas->nchan_ism = nchan_ism;