Replacment of count_malloc() with malloc() (bac3d12a) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -781,10 +781,10 @@ int main(

		inBufferSize = frameSize_smpls * totalNumInChannels;
		outBufferSize = frameSize_smpls * numOutChannels;
		inpInt16Buffer = count_malloc( inBufferSize * sizeof( int16_t ) );
		inFloatBuffer = count_malloc( inBufferSize * sizeof( float ) );
		outInt16Buffer = count_malloc( outBufferSize * sizeof( int16_t ) );
		outFloatBuffer = count_malloc( outBufferSize * sizeof( float ) );
		inpInt16Buffer = malloc( inBufferSize * sizeof( int16_t ) );
		inFloatBuffer = malloc( inBufferSize * sizeof( float ) );
		outInt16Buffer = malloc( outBufferSize * sizeof( int16_t ) );
		outFloatBuffer = malloc( outBufferSize * sizeof( float ) );

		inBuffer.config.numSamplesPerChannel = (int16_t) frameSize_smpls;
		inBuffer.config.numChannels = (int16_t) totalNumInChannels;
		@@ -1032,10 +1032,10 @@ int main(
		#endif

		/* === Close === */
		count_free( inpInt16Buffer );
		count_free( inFloatBuffer );
		count_free( outInt16Buffer );
		count_free( outFloatBuffer );
		free( inpInt16Buffer );
		free( inFloatBuffer );
		free( outInt16Buffer );
		free( outFloatBuffer );
		for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )
		{
		MasaFileReader_close( &masaReaders[i] );
		@@ -1579,7 +1579,7 @@ IsmPositionProvider *IsmPositionProvider_open(
		IsmPositionProvider *ipp;
		uint16_t i;

		ipp = (IsmPositionProvider *) count_malloc( sizeof( IsmPositionProvider ) );
		ipp = (IsmPositionProvider *) malloc( sizeof( IsmPositionProvider ) );
		ipp->frameCounter = 0;
		ipp->numObjects = 0;

		@@ -1696,16 +1696,16 @@ void IsmPositionProvider_close( IsmPositionProvider *positionProvider )

		if ( positionProvider->positions[i] != NULL )
		{
		count_free( positionProvider->positions[i] );
		free( positionProvider->positions[i] );
		}

		if ( positionProvider->positionDurations[i] != NULL )
		{
		count_free( positionProvider->positionDurations[i] );
		free( positionProvider->positionDurations[i] );
		}
		}

		count_free( positionProvider );
		free( positionProvider );

		return;
		}
		@@ -1954,8 +1954,8 @@ static void parseIsm(
		if ( parseUint32( line, &numberOfObjectPositionsToRead ) == 0 )
		{
		positionProvider->numPositions[idx] = numberOfObjectPositionsToRead;
		positionProvider->positions[idx] = count_malloc( numberOfObjectPositionsToRead * sizeof( IVAS_REND_AudioObjectPosition ) );
		positionProvider->positionDurations[idx] = count_malloc( numberOfObjectPositionsToRead * sizeof( uint16_t ) );
		positionProvider->positions[idx] = malloc( numberOfObjectPositionsToRead * sizeof( IVAS_REND_AudioObjectPosition ) );
		positionProvider->positionDurations[idx] = malloc( numberOfObjectPositionsToRead * sizeof( uint16_t ) );

		for ( i = 0; i < numberOfObjectPositionsToRead; ++i )
		{

lib_com/cldfb.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -706,7 +706,7 @@ ivas_error openCldfb(
		HANDLE_CLDFB_FILTER_BANK hs;
		int16_t buf_len;

		hs = (HANDLE_CLDFB_FILTER_BANK) count_malloc( sizeof( CLDFB_FILTER_BANK ) );
		hs = (HANDLE_CLDFB_FILTER_BANK) malloc( sizeof( CLDFB_FILTER_BANK ) );
		if ( hs == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
		@@ -728,7 +728,7 @@ ivas_error openCldfb(
		buf_len = hs->p_filter_length;
		}

		hs->cldfb_state = (float ) count_malloc( buf_len sizeof( float ) );
		hs->cldfb_state = (float ) malloc( buf_len sizeof( float ) );
		if ( hs->cldfb_state == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
		@@ -889,9 +889,9 @@ void deleteCldfb(
		{
		if ( hs->cldfb_state )
		{
		count_free( hs->cldfb_state );
		free( hs->cldfb_state );
		}
		count_free( hs );
		free( hs );
		*h_cldfb = NULL;
		}

		@@ -1148,7 +1148,7 @@ ivas_error cldfb_save_memory(
		hs->memory_length = hs->p_filter_length;
		}

		hs->memory = (float ) count_malloc( hs->memory_length sizeof( float ) );
		hs->memory = (float ) malloc( hs->memory_length sizeof( float ) );
		if ( hs->memory == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB\n" );
		@@ -1199,7 +1199,7 @@ void cldfb_restore_memory(
		}

		hs->memory_length = 0;
		count_free( hs->memory );
		free( hs->memory );
		hs->memory = NULL;

		return;

lib_com/fd_cng_com.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ ivas_error createFdCngCom(
		HANDLE_FD_CNG_COM hs;

		/* Allocate memory */
		hs = (HANDLE_FD_CNG_COM) count_malloc( sizeof( FD_CNG_COM ) );
		hs = (HANDLE_FD_CNG_COM) malloc( sizeof( FD_CNG_COM ) );

		if ( hs == NULL )
		{
		@@ -162,7 +162,7 @@ void deleteFdCngCom(

		if ( hsCom != NULL )
		{
		count_free( hsCom );
		free( hsCom );
		*hFdCngCom = NULL;
		}

lib_com/ivas_cov_smooth.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -93,12 +93,12 @@ ivas_error ivas_spar_covar_smooth_enc_open(
		ivas_cov_smooth_state_t *hCovState;
		int16_t i, j;

		if ( ( hCovState = (ivas_cov_smooth_state_t *) count_malloc( sizeof( ivas_cov_smooth_state_t ) ) ) == NULL )
		if ( ( hCovState = (ivas_cov_smooth_state_t *) malloc( sizeof( ivas_cov_smooth_state_t ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR COV encoder" );
		}

		if ( ( hCovState->pSmoothing_factor = (float ) count_malloc( sizeof( float ) cov_smooth_cfg->max_bands ) ) == NULL )
		if ( ( hCovState->pSmoothing_factor = (float ) malloc( sizeof( float ) cov_smooth_cfg->max_bands ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR COV encoder" );
		}
		@@ -107,7 +107,7 @@ ivas_error ivas_spar_covar_smooth_enc_open(
		{
		for ( j = 0; j < nchan_inp; j++ )
		{
		if ( ( hCovState->pPrior_cov_real[i][j] = (float ) count_malloc( sizeof( float ) cov_smooth_cfg->max_bands ) ) == NULL )
		if ( ( hCovState->pPrior_cov_real[i][j] = (float ) malloc( sizeof( float ) cov_smooth_cfg->max_bands ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR COV encoder" );
		}
		@@ -141,19 +141,19 @@ void ivas_spar_covar_smooth_enc_close(

		if ( hCovState != NULL )
		{
		count_free( hCovState->pSmoothing_factor );
		free( hCovState->pSmoothing_factor );
		hCovState->pSmoothing_factor = NULL;

		for ( i = 0; i < nchan_inp; i++ )
		{
		for ( j = 0; j < nchan_inp; j++ )
		{
		count_free( hCovState->pPrior_cov_real[i][j] );
		free( hCovState->pPrior_cov_real[i][j] );
		hCovState->pPrior_cov_real[i][j] = NULL;
		}
		}

		count_free( hCovState );
		free( hCovState );
		hCovState_out = NULL;
		}

lib_com/ivas_fb_mixer.c

+20 −20

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ ivas_error ivas_fb_set_cfg(
		{
		IVAS_FB_CFG *pFb_cfg;

		if ( ( pFb_cfg = (IVAS_FB_CFG *) count_malloc( sizeof( IVAS_FB_CFG ) ) ) == NULL )
		if ( ( pFb_cfg = (IVAS_FB_CFG *) malloc( sizeof( IVAS_FB_CFG ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer config" );
		}
		@@ -187,7 +187,7 @@ ivas_error ivas_FB_mixer_open(
		frame_len = (int16_t) ( sampling_rate / FRAMES_PER_SEC );


		if ( ( hFbMixer = (IVAS_FB_MIXER_HANDLE) count_malloc( sizeof( IVAS_FB_MIXER_DATA ) ) ) == NULL )
		if ( ( hFbMixer = (IVAS_FB_MIXER_HANDLE) malloc( sizeof( IVAS_FB_MIXER_DATA ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
		}
		@@ -196,7 +196,7 @@ ivas_error ivas_FB_mixer_open(
		if ( fb_cfg->num_out_chans > 0 )
		{
		#endif
		if ( ( hFbMixer->pFb = (ivas_filterbank_t *) count_malloc( sizeof( ivas_filterbank_t ) ) ) == NULL )
		if ( ( hFbMixer->pFb = (ivas_filterbank_t *) malloc( sizeof( ivas_filterbank_t ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
		}
		@@ -231,12 +231,12 @@ ivas_error ivas_FB_mixer_open(
		{
		j = fb_cfg->remix_order[i];

		if ( ( hFbMixer->ppFilterbank_inFR_re[j] = (float ) count_malloc( sizeof( float ) frame_len ) ) == NULL )
		if ( ( hFbMixer->ppFilterbank_inFR_re[j] = (float ) malloc( sizeof( float ) frame_len ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
		}

		if ( ( hFbMixer->ppFilterbank_inFR_im[j] = (float ) count_malloc( sizeof( float ) frame_len ) ) == NULL )
		if ( ( hFbMixer->ppFilterbank_inFR_im[j] = (float ) malloc( sizeof( float ) frame_len ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
		}
		@@ -253,7 +253,7 @@ ivas_error ivas_FB_mixer_open(
		}
		for ( i = 0; i < num_chs_alloc; i++ )
		{
		if ( ( hFbMixer->ppFilterbank_prior_input[i] = (float ) count_malloc( sizeof( float ) fb_cfg->prior_input_length ) ) == NULL )
		if ( ( hFbMixer->ppFilterbank_prior_input[i] = (float ) malloc( sizeof( float ) fb_cfg->prior_input_length ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
		}
		@@ -264,7 +264,7 @@ ivas_error ivas_FB_mixer_open(
		{
		float *pTemp_mem;

		if ( ( pTemp_mem = (float ) count_malloc( sizeof( float ) fb_cfg->num_out_chans * fb_cfg->num_in_chans * IVAS_MAX_NUM_BANDS ) ) == NULL )
		if ( ( pTemp_mem = (float ) malloc( sizeof( float ) fb_cfg->num_out_chans * fb_cfg->num_in_chans * IVAS_MAX_NUM_BANDS ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer" );
		}
		@@ -291,7 +291,7 @@ ivas_error ivas_FB_mixer_open(
		{
		for ( i = 0; i < num_bands; i++ )
		{
		if ( ( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = (float ) count_malloc( sizeof( float ) pActive_bins_per_band_abs[i] ) ) == NULL )
		if ( ( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = (float ) malloc( sizeof( float ) pActive_bins_per_band_abs[i] ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
		}
		@@ -309,12 +309,12 @@ ivas_error ivas_FB_mixer_open(

		for ( j = start_diff_band_non48k; j < num_bands; j++ )
		{
		if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] = (float ) count_malloc( sizeof( float ) pActive_bins_per_band[j] ) ) == NULL )
		if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] = (float ) malloc( sizeof( float ) pActive_bins_per_band[j] ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
		}

		if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] = (float ) count_malloc( sizeof( float ) pActive_bins_per_band[j] ) ) == NULL )
		if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] = (float ) malloc( sizeof( float ) pActive_bins_per_band[j] ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
		}
		@@ -402,10 +402,10 @@ void ivas_FB_mixer_close(
		{
		j = fb_cfg->remix_order[i];

		count_free( hFbMixer->ppFilterbank_inFR_re[j] );
		free( hFbMixer->ppFilterbank_inFR_re[j] );
		hFbMixer->ppFilterbank_inFR_re[j] = NULL;

		count_free( hFbMixer->ppFilterbank_inFR_im[j] );
		free( hFbMixer->ppFilterbank_inFR_im[j] );
		hFbMixer->ppFilterbank_inFR_im[j] = NULL;
		}
		}
		@@ -420,13 +420,13 @@ void ivas_FB_mixer_close(
		}
		for ( i = 0; i < num_chs_alloc; i++ )
		{
		count_free( hFbMixer->ppFilterbank_prior_input[i] );
		free( hFbMixer->ppFilterbank_prior_input[i] );
		hFbMixer->ppFilterbank_prior_input[i] = NULL;
		}

		if ( ( fb_cfg->active_w_mixing != -1 ) && ( fb_cfg->num_out_chans > 0 ) )
		{
		count_free( hFbMixer->prior_mixer[0][0] );
		free( hFbMixer->prior_mixer[0][0] );
		hFbMixer->prior_mixer[0][0] = NULL;
		}

		@@ -438,7 +438,7 @@ void ivas_FB_mixer_close(
		{
		for ( i = 0; i < num_bands; i++ )
		{
		count_free( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] );
		free( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] );
		hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = NULL;
		}
		}
		@@ -450,10 +450,10 @@ void ivas_FB_mixer_close(

		for ( j = start_diff_band_non48k; j < num_bands; j++ )
		{
		count_free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] );
		free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] );
		hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] = NULL;

		count_free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] );
		free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] );
		hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] = NULL;
		}
		}
		@@ -461,17 +461,17 @@ void ivas_FB_mixer_close(

		if ( hFbMixer->pFb != NULL )
		{
		count_free( hFbMixer->pFb );
		free( hFbMixer->pFb );
		hFbMixer->pFb = NULL;
		}

		if ( hFbMixer->fb_cfg != NULL )
		{
		count_free( hFbMixer->fb_cfg );
		free( hFbMixer->fb_cfg );
		hFbMixer->fb_cfg = NULL;
		}

		count_free( hFbMixer );
		free( hFbMixer );
		hFbMixer = NULL;
		}