update (0c2086b5) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -1068,18 +1068,30 @@ static bool parseCmdlIVAS_dec(

		if ( strcmp( argv_to_upper, "-VOIP" ) == 0 )
		{
		#ifdef LIB_DEC_REVISION
		arg->voipMode = true;
		#else
		arg->voipMode = 1;
		#endif
		i++;
		}
		else if ( strcmp( argv_to_upper, "-VOIP_HF_ONLY=0" ) == 0 )
		{
		#ifdef LIB_DEC_REVISION
		arg->voipMode = true;
		#else
		arg->voipMode = 1;
		#endif
		arg->inputFormat = IVAS_DEC_INPUT_FORMAT_RTPDUMP;
		i++;
		}
		else if ( strcmp( argv_to_upper, "-VOIP_HF_ONLY=1" ) == 0 )
		{
		#ifdef LIB_DEC_REVISION
		arg->voipMode = true;
		#else
		arg->voipMode = 1;
		#endif
		arg->inputFormat = IVAS_DEC_INPUT_FORMAT_RTPDUMP_HF;
		i++;
		}
		@@ -1818,7 +1830,6 @@ static ivas_error initOnFirstGoodFrame(
		int32_t pcmFrameSize;

		if ( ( error = IVAS_DEC_GetPcmFrameSize( hIvasDec, &pcmFrameSize ) ) != IVAS_ERR_OK )

		{
		fprintf( stderr, "\nError in IVAS_DEC_GetPcmFrameSize, error code: %d\n", error );
		return error;

lib_dec/lib_dec.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -181,7 +181,6 @@ ivas_error IVAS_DEC_Open(
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for IVAS decoder handle" );
		}

		hIvasDec = *phIvasDec;
		hIvasDec->hVoIP = NULL;
		hIvasDec->apaExecBuffer = NULL;
		@@ -314,7 +313,6 @@ static ivas_error isar_set_split_rend_setup(
		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* init_decoder_config()
		*
		@@ -527,7 +525,6 @@ ivas_error IVAS_DEC_Configure(
		{
		return IVAS_ERR_WRONG_PARAMS;
		}

		if ( outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		hDecoderConfig->render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
		@@ -678,7 +675,6 @@ ivas_error IVAS_DEC_GetRenderFramesize(
		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* IVAS_DEC_GetGetRenderFramesizeSamples( )
		*
		@@ -700,7 +696,6 @@ ivas_error IVAS_DEC_GetRenderFramesizeSamples(
		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* IVAS_DEC_GetGetRenderFramesizeMs( )
		*
		@@ -744,7 +739,6 @@ ivas_error IVAS_DEC_GetReferencesUpdateFrequency(
		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* IVAS_DEC_GetGetNumOrientationSubframes( )
		*
		@@ -927,7 +921,6 @@ ivas_error IVAS_DEC_FeedFrame_Serial(
		bfi = 2;
		}
		}

		if ( ( error = read_indices( hIvasDec->st_ivas, serial, num_bits, &hIvasDec->prev_ft_speech, &hIvasDec->CNG, bfi ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -2538,7 +2531,6 @@ ivas_error IVAS_DEC_GetNumObjects(
		is_masa_ism = 1;
		}
		}

		if ( hIvasDec->st_ivas->ivas_format == ISM_FORMAT \|\| hIvasDec->st_ivas->ivas_format == SBA_ISM_FORMAT \|\| hIvasDec->st_ivas->ivas_format == MASA_ISM_FORMAT \|\| is_masa_ism )
		{
		*numObjects = hIvasDec->st_ivas->nchan_ism;
		@@ -2711,7 +2703,6 @@ ivas_error IVAS_DEC_GetObjectMetadata(
		is_masa_ism = 1;
		}
		}

		if ( st_ivas->ivas_format != ISM_FORMAT && st_ivas->ivas_format != MASA_ISM_FORMAT && st_ivas->ivas_format != SBA_ISM_FORMAT && is_masa_ism == 0 )
		{
		return IVAS_ERR_WRONG_MODE;
		@@ -3119,7 +3110,6 @@ ivas_error IVAS_DEC_GetHrtfParamBinHandle(
		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* IVAS_DEC_GetHrtfStatisticsHandle( )
		*
		@@ -3891,6 +3881,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
		extBufferedTime_ms = extBufferedSamples * 1000 / hDecoderConfig->output_Fs;
		dataUnit = NULL;


		/* pop one access unit from the jitter buffer */
		result = JB4_PopDataUnit( hVoIP->hJBM, systemTimestamp_ms, extBufferedTime_ms, &dataUnit, &scale, &maxScaling );
		if ( result != 0 )
		@@ -3905,6 +3896,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
		dbgwrite( &scale, sizeof( uint32_t ), 1, 1, "./res/JBM_scale.dat" );
		dbgwrite( &maxScaling, sizeof( uint32_t ), 1, 1, "./res/JBM_maxScale.dat" );
		#endif

		/* avoid time scaling multiple times within one 20ms frame*/
		if ( scale != 100U )
		{
		@@ -4212,6 +4204,7 @@ static void IVAS_DEC_Close_VoIP(
		return;
		}


		#ifdef SUPPORT_JBM_TRACEFILE
		/---------------------------------------------------------------------
		* store_JbmData()
		@@ -4274,8 +4267,10 @@ ivas_error IVAS_DEC_GetJbmData(

		return IVAS_ERR_OK;
		}

		#endif


		/---------------------------------------------------------------------
		* IVAS_DEC_GetErrorMessage( )
		*
		@@ -4508,6 +4503,7 @@ ivas_error IVAS_DEC_PrintConfig(
		return IVAS_ERR_OK;
		}


		#ifdef DEBUGGING
		/---------------------------------------------------------------------
		* IVAS_DEC_PrintConfigWithBitstream( )
		@@ -4574,6 +4570,7 @@ void IVAS_DEC_PrintConfigWithVoipBitstream(
		#undef WMC_TOOL_SKIP
		#endif


		/---------------------------------------------------------------------
		* IVAS_DEC_PrintDisclaimer( )
		*
		@@ -4603,7 +4600,6 @@ static ivas_error evs_dec_main(
		float *floatBuf,
		int16_t *pcmBuf
		#endif

		)
		{
		DEC_CORE_HANDLE *hCoreCoder;
		@@ -4732,6 +4728,7 @@ static ivas_error evs_dec_main(
		return IVAS_ERR_OK;
		}


		#ifdef DEBUGGING
		/---------------------------------------------------------------------
		* IVAS_DEC_GetBer_detect_flag()
		@@ -4881,8 +4878,10 @@ ivas_error IVAS_DEC_GetSbaDebugParams(
		return IVAS_ERR_OK;
		}
		#endif /* DEBUG_SBA_AUDIO_DUMP */

		#endif /* DEBUGGING */


		/---------------------------------------------------------------------
		* input_format_API_to_internal()
		*
		@@ -5022,6 +5021,7 @@ static ivas_error IVAS_DEC_VoIP_reconfigure(
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate VoIP handle" );
		}

		set_zero( hIvasDec->apaExecBuffer, apa_buffer_size * nTransportChannels );
		#ifndef LIB_DEC_REVISION
		}