cleaning: remove obsolete function IVAS_ENC_GetNumInputChannels() + add section comment (c97757a8) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/encoder.c

+12 −15

Original line number	Diff line number	Diff line
		@@ -515,23 +515,9 @@ int main(
		#endif

		/------------------------------------------------------------------------------------------
		* Compensate for encoder delay (bitstream aligned with input signal)
		* Allocate input data buffer
		------------------------------------------------------------------------------------------/

		int16_t encDelayInSamples;
		if ( ( error = IVAS_ENC_GetDelay( hIvasEnc, &encDelayInSamples ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nGetDelay failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;
		}

		int16_t numInputChannels;
		if ( ( error = IVAS_ENC_GetNumInputChannels( hIvasEnc, &numInputChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nGetNumInputChannels failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;
		}

		int16_t pcmBufSize;
		if ( ( error = IVAS_ENC_GetInputBufferSize( hIvasEnc, &pcmBufSize ) ) != IVAS_ERR_OK )
		{
		@@ -541,6 +527,17 @@ int main(

		pcmBuf = malloc( pcmBufSize * sizeof( int16_t ) );

		/------------------------------------------------------------------------------------------
		* Compensate for encoder delay (bitstream aligned with input signal)
		------------------------------------------------------------------------------------------/

		int16_t encDelayInSamples;
		if ( ( error = IVAS_ENC_GetDelay( hIvasEnc, &encDelayInSamples ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nGetDelay failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( arg.delayCompensationEnabled && encDelayInSamples )
		{
		/* read samples and throw them away */

lib_enc/lib_enc.c

+0 −27

Original line number	Diff line number	Diff line
		@@ -940,33 +940,6 @@ ivas_error IVAS_ENC_GetDelay(
		}


		/---------------------------------------------------------------------
		* IVAS_ENC_GetNumInputChannels()
		*
		*
		---------------------------------------------------------------------/

		ivas_error IVAS_ENC_GetNumInputChannels(
		const IVAS_ENC_HANDLE hIvasEnc, /* i : IVAS encoder handle */
		int16_t numInChannels / o : number of input channels with current */
		)
		{
		if ( !hIvasEnc->isConfigured )
		{
		return IVAS_ERR_NOT_CONFIGURED;
		}

		if ( numInChannels == NULL )
		{
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		*numInChannels = hIvasEnc->st_ivas->hEncoderConfig->nchan_inp;

		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* getInputBufferSize()
		*

lib_enc/lib_enc.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -288,12 +288,6 @@ ivas_error IVAS_ENC_GetDelay(
		int16_t delay / o : encoder delay */
		);

		/! r: encoder error code /
		ivas_error IVAS_ENC_GetNumInputChannels(
		const IVAS_ENC_HANDLE hIvasEnc, /* i/o: IVAS encoder handle */
		int16_t numInChannels / o : number of input channels with current configuration */
		);

		/! r: encoder error code /
		ivas_error IVAS_ENC_GetInputBufferSize(
		const IVAS_ENC_HANDLE hIvasEnc, /* i/o: IVAS encoder handle */