move ivas_dec_reconfig_split_rend() after ivas_init_decoder() (4d7fb32d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_init_dec.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -523,20 +523,6 @@ ivas_error ivas_dec_setup(
		}
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		/-----------------------------------------------------------------
		* reconfig split rendering as renderer might change after bitrate switching
		-----------------------------------------------------------------/

		if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		if ( ( error = ivas_dec_reconfig_split_rend( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		#endif

		/-------------------------------------------------------------------
		* Initialize decoder in the first good frame based on IVAS format
		* and number of transport channels
		@@ -555,6 +541,20 @@ ivas_error ivas_dec_setup(
		}
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		/-----------------------------------------------------------------
		* reconfig split rendering as renderer might change after bitrate switching
		-----------------------------------------------------------------/

		if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		if ( ( error = ivas_dec_reconfig_split_rend( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		#endif

		/----------------------------------------------------------------
		* Reset bitstream pointers
		----------------------------------------------------------------/