Commit e05ea4c7 authored by vaclav's avatar vaclav
Browse files

remove obsolete callings of ivas_masa_ism_separate_object_renderer_open()

parent a6786399

lib_dec/ivas_init_dec.c

+0 −12
Original line number Diff line number Diff line
@@ -1238,18 +1238,6 @@ ivas_error ivas_init_decoder( 
        {

            reset_indices_dec( st_ivas->hCPE[0]->hCoreCoder[n] );

        }



#ifdef OMASA_UPDATES

        if ( st_ivas->renderer_type == RENDERER_DIRAC && ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_DISC ) )

#else

        if ( st_ivas->renderer_type == RENDERER_DIRAC && ( st_ivas->ism_mode == ISM_MASA_MODE_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_DISC ) )

#endif

        {

            if ( ( error = ivas_masa_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }

    }

#endif

    else if ( st_ivas->ivas_format == MC_FORMAT )

lib_dec/ivas_omasa_dec.c

+3 −54
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ ivas_error ivas_omasa_dec_config( 
    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */

)

{

    int16_t k, n, sce_id, nSCE_old, nchan_hp20_old, numCldfbAnalyses_old, numCldfbSyntheses_old, n_MD;

    int16_t k, sce_id, nSCE_old, nchan_hp20_old, numCldfbAnalyses_old, numCldfbSyntheses_old, n_MD;

    int32_t ivas_total_brate, ism_total_brate, cpe_brate;

    IVAS_FORMAT ivas_format_old;

    ISM_MODE ism_mode_old;
@@ -290,60 +290,9 @@ ivas_error ivas_omasa_dec_config( 


        /* objects renderer reconfig. */

#ifdef OMASA_UPDATES

        if ( st_ivas->renderer_type == RENDERER_DIRAC && ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_DISC ) )

        if ( st_ivas->ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ && st_ivas->ism_mode != ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->hIsmRendererData != NULL )

#else

        if ( st_ivas->renderer_type == RENDERER_DIRAC && ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_DISC ) )

#endif

        {

            if ( st_ivas->hIsmRendererData == NULL )

            {

                if ( ( error = ivas_masa_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

            }

#ifdef OMASA_UPDATES

            else if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

#else

            else if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

#endif

            {

                for ( n = 1; n < st_ivas->hMasaIsmData->delayBuffer_nchan; n++ )

                {

                    free( st_ivas->hMasaIsmData->delayBuffer[n] );

                }



                st_ivas->hMasaIsmData->delayBuffer_nchan = 1;

            }

            else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

            {

                float tmp[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];



                st_ivas->hMasaIsmData->delayBuffer_nchan = st_ivas->nchan_ism;



                mvr2r( st_ivas->hMasaIsmData->delayBuffer[0], tmp, st_ivas->hMasaIsmData->delayBuffer_size );

                free( st_ivas->hMasaIsmData->delayBuffer[0] );

                free( st_ivas->hMasaIsmData->delayBuffer );

                if ( ( st_ivas->hMasaIsmData->delayBuffer = (float **) malloc( st_ivas->hMasaIsmData->delayBuffer_nchan * sizeof( float * ) ) ) == NULL )

                {

                    return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for MASA ISM delay buffer \n" ) );

                }



                for ( n = 0; n < st_ivas->hMasaIsmData->delayBuffer_nchan; n++ )

                {

                    if ( ( st_ivas->hMasaIsmData->delayBuffer[n] = (float *) malloc( st_ivas->hMasaIsmData->delayBuffer_size * sizeof( float ) ) ) == NULL )

                    {

                        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for MASA ISM delay buffer \n" ) );

                    }

                    set_zero( st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );

                }

                mvr2r( tmp, st_ivas->hMasaIsmData->delayBuffer[0], st_ivas->hMasaIsmData->delayBuffer_size );

            }

        }

#ifdef OMASA_UPDATES

        else if ( st_ivas->ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ && st_ivas->ism_mode != ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->hIsmRendererData != NULL )

#else

        else if ( st_ivas->ism_mode != ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->hIsmRendererData != NULL )

        if ( st_ivas->ism_mode != ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->hIsmRendererData != NULL )

#endif

        {

            ivas_masa_ism_data_close( &( st_ivas->hMasaIsmData ) );