Commit ea37c883 authored by bayers's avatar bayers
Browse files

ivas object editing, fix Linux comple error, use the correct PCM type enum from the API

parent 565774e3

lib_dec/lib_dec.c

+6 −6
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ ivas_error IVAS_DEC_Open( 
#ifdef OBJ_EDITING_API

    hIvasDec->flushbuffer = NULL;

#ifdef SPLIT_REND_WITH_HEAD_ROT

    hIvasDec->pcmType = PCM_NOT_KNOW;

    hIvasDec->pcmType = IVAS_DEC_PCM_INVALID;

#endif

    hIvasDec->nSamplesFlushed = 0;

    hIvasDec->hasEditableParameters = false;
@@ -554,7 +554,7 @@ ivas_error IVAS_DEC_Configure( 
    {

#ifdef SPLIT_REND_WITH_HEAD_ROT

        hIvasDec->flushbuffer = (void *) malloc( CPE_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( int16_t ) );

        hIvasDec->pcmType = PCM_INT16;

        hIvasDec->pcmType = IVAS_DEC_PCM_INT16;

        set_s( (int16_t *) hIvasDec->flushbuffer, 0, CPE_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES );

#else

        hIvasDec->flushbuffer = (int16_t *) malloc( CPE_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( int16_t ) );
@@ -833,7 +833,7 @@ ivas_error IVAS_DEC_EnableVoIP( 
    {

#ifdef SPLIT_REND_WITH_HEAD_ROT

        hIvasDec->flushbuffer = (void *) malloc( CPE_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( int16_t ) );

        hIvasDec->pcmType = PCM_INT16;

        hIvasDec->pcmType = IVAS_DEC_PCM_INT16;

        set_s( (int16_t *) hIvasDec->flushbuffer, 0, CPE_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES );

#else

        hIvasDec->flushbuffer = (int16_t *) malloc( CPE_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( int16_t ) );
@@ -1320,11 +1320,11 @@ ivas_error IVAS_DEC_GetSamples( 
                assert( hIvasDec->pcmType == pcmType );

#endif

                pPcmBuffer = pcm_buffer_offset( pcmBuf, pcmType, nSamplesRendered * nOutChannels );

                if ( pcmType == PCM_INT16 )

                if ( pcmType == IVAS_DEC_PCM_INT16 )

                {

                    mvs2s( (int16_t *) hIvasDec->flushbuffer, pPcmBuffer, hIvasDec->nSamplesFlushed * nOutChannels );

                }

                else if ( pcmType == PCM_FLOAT32 )

                else if ( pcmType == IVAS_DEC_PCM_FLOAT )

                {

                    mvr2r( (float *) hIvasDec->flushbuffer, pPcmBuffer, hIvasDec->nSamplesFlushed * nOutChannels );

                }
@@ -1429,7 +1429,7 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( 
    if ( hIvasDec->flushbuffer == NULL )

    {

        hIvasDec->flushbuffer = (void *) malloc( numPoses * BINAURAL_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( float ) );

        hIvasDec->pcmType = PCM_FLOAT32;

        hIvasDec->pcmType = IVAS_DEC_PCM_FLOAT;

        set_zero( (float *) hIvasDec->flushbuffer, numPoses * BINAURAL_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES );

    }

#endif