Commit 18cf00c4 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '1680_basop_port-object-editing-API' of... 

Merge branch '1680_basop_port-object-editing-API' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1680_basop_port-object-editing-API
parents 68019414 2ba931fc

lib_dec/ivas_ism_param_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1322,7 +1322,7 @@ void ivas_param_ism_dec_dequant_md_fx( 
    Decoder_Struct *st_ivas )

{

    /* De-quantization */

    IF( !( EQ_16( st_ivas->hDecoderConfig->ivas_total_brate, IVAS_SID_5k2 ) || EQ_16( st_ivas->hDecoderConfig->ivas_total_brate, FRAME_NO_DATA ) ) )

    IF( !( EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, IVAS_SID_5k2 ) || EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, FRAME_NO_DATA ) ) )

    {

        ivas_param_ism_dec_dequant_DOA_fx( st_ivas->hParamIsmDec, st_ivas->nchan_ism );

        ivas_param_ism_dec_dequant_powrat_fx( st_ivas->hParamIsmDec );

lib_dec/lib_dec_fx.c

+9 −9
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ void IVAS_DEC_Close( 
        free( ( *phIvasDec )->apaExecBuffer_fx );

    }

#ifdef OBJ_EDITING_API

    if ( ( *phIvasDec )->flushbuffer != NULL )

    IF( ( *phIvasDec )->flushbuffer != NULL )

    {

        free( ( *phIvasDec )->flushbuffer );

    }
@@ -653,7 +653,7 @@ ivas_error IVAS_DEC_Configure( 
    test();

    test();

    test();

    if ( tsmEnabled && ( outputConfig == IVAS_AUDIO_CONFIG_BINAURAL || outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM || outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    IF( tsmEnabled && ( EQ_32( outputConfig, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) || EQ_32( outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) || EQ_32( outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) )

    {

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

        set16_fx( (Word16 *) hIvasDec->flushbuffer, 0, CPE_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES );
@@ -989,7 +989,7 @@ ivas_error IVAS_DEC_EnableVoIP( 
#endif



#ifdef OBJ_EDITING_API

    if ( hIvasDec->flushbuffer == NULL && ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    IF( hIvasDec->flushbuffer == NULL && ( EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) || EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) )

    {

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

        set16_fx( (Word16 *) hIvasDec->flushbuffer, 0, CPE_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES );
@@ -1474,7 +1474,7 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( 


#ifdef OBJ_EDITING_API

    /* init flush buffer for rate switch if not already initizalized */

    if ( hIvasDec->flushbuffer == NULL )

    IF( hIvasDec->flushbuffer == NULL )

    {

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

        set16_fx( (Word16 *) hIvasDec->flushbuffer, 0, numPoses * BINAURAL_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES );
@@ -2293,7 +2293,7 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
    ELSE

    {

#ifdef OBJ_EDITING_API

        if ( st_ivas->ism_mode == ISM_MODE_DISC )

        IF( EQ_32( st_ivas->ism_mode, ISM_MODE_DISC ) )

        {

            metadata->azimuth_fx = hIsmMeta->edited_azimuth_fx;

            metadata->elevation_fx = hIsmMeta->edited_elevation_fx;
@@ -2306,7 +2306,7 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
            metadata->gainFactor_fx = hIsmMeta->edited_gain_fx;

            metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;

        }

        else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) )

        {

            metadata->azimuth_fx = st_ivas->hParamIsmDec->edited_azimuth_values_fx[objectIdx];

            metadata->elevation_fx = st_ivas->hParamIsmDec->edited_elevation_values_fx[objectIdx];
@@ -2317,7 +2317,7 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
            metadata->gainFactor_fx = ONE_IN_Q31;

            metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;

        }

        else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        ELSE IF( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) || EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )

        {

            metadata->azimuth_fx = st_ivas->hIsmMetaData[objectIdx]->edited_azimuth_fx;

            metadata->elevation_fx = st_ivas->hIsmMetaData[objectIdx]->edited_elevation_fx;
@@ -4417,10 +4417,10 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 


#ifdef OBJ_EDITING_API

            /* check if we still need to prepare the renderer */

            if ( hIvasDec->hasBeenPreparedRendering == false )

            IF( hIvasDec->hasBeenPreparedRendering == false )

            {



                if ( ( error = IVAS_DEC_PrepareRenderer( hIvasDec ) ) != IVAS_ERR_OK )

                IF( NE_32( ( error = IVAS_DEC_PrepareRenderer( hIvasDec ) ), IVAS_ERR_OK ) )

                {

                    return error;

                }