Commit 84c744e6 authored by vaclav's avatar vaclav
Browse files

accept OMASA_OBJ_REND_CLOSE (with simplification), OMASA_BIT_BUFF_SZ and OMASA_BIT_BUFF_SZ1

parent 3fddf874

lib_com/bitstream.c

+0 −8
Original line number Diff line number Diff line
@@ -553,11 +553,7 @@ int16_t get_ivas_max_num_indices( 
        }

        else if ( ivas_total_brate <= IVAS_160k )

        {

#ifdef OMASA_BIT_BUFF_SZ1

            return 900;

#else

            return 850;

#endif

        }

        else if ( ivas_total_brate <= IVAS_192k )

        {
@@ -565,11 +561,7 @@ int16_t get_ivas_max_num_indices( 
        }

        else if ( ivas_total_brate <= IVAS_256k )

        {

#ifdef OMASA_BIT_BUFF_SZ

            return 1300;

#else

            return 1150;

#endif

        }

        else if ( ivas_total_brate <= IVAS_384k )

        {

lib_com/ivas_prot.h

+1 −3
Original line number Diff line number Diff line
@@ -5763,11 +5763,9 @@ ivas_error ivas_masa_ism_separate_object_renderer_open( 
    Decoder_Struct* st_ivas                                     /* i/o: IVAS decoder structure                  */

);



#ifdef OMASA_OBJ_REND_CLOSE

ivas_error ivas_masa_ism_separate_object_renderer_close(

void ivas_masa_ism_separate_object_renderer_close(

    Decoder_Struct* st_ivas                                     /* i/o: IVAS decoder structure                  */

);

#endif



void ivas_masa_ism_separate_object_render(

    Decoder_Struct* st_ivas,                                    /* i/o: IVAS decoder structure                  */

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -218,9 +218,6 @@ 
#define FIX_356_ISM_METADATA_SYNC_OMASA // temp. fix

#define OMASA_BRSW_MONO_FIX                             /* Nokia: fix renderer config under rateswitching and MONO output */

#define OMASA_FIX_LOW_FS                                /* Nokia: fixes related to lower input signal sampling rates */

#define OMASA_BIT_BUFF_SZ                               /* Nokia: increase bitstream index buffer initial size */

#define OMASA_BIT_BUFF_SZ1                              /* Nokia: increase bitstream index buffer initial size */

#define OMASA_OBJ_REND_CLOSE                            /* Nokia: close OMASA separate object renderer */

#endif



/* ################## End BE DEVELOPMENT switches ######################### */

lib_dec/ivas_ism_renderer.c

+7 −4
Original line number Diff line number Diff line
@@ -412,18 +412,18 @@ ivas_error ivas_masa_ism_separate_object_renderer_open( 
}





#ifdef OMASA_OBJ_REND_CLOSE

/*-------------------------------------------------------------------------*

 * ivas_masa_ism_separate_object_renderer_close()

 *

 * Close structures, reserve memory, and init values.

 *-------------------------------------------------------------------------*/



ivas_error ivas_masa_ism_separate_object_renderer_close(

void ivas_masa_ism_separate_object_renderer_close(

    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure      */

)

{

    int16_t i;



    if ( st_ivas->hMasaIsmData != NULL )

    {

        if ( st_ivas->hMasaIsmData->delayBuffer != NULL )
@@ -436,10 +436,12 @@ ivas_error ivas_masa_ism_separate_object_renderer_close( 
                    st_ivas->hMasaIsmData->delayBuffer[i] = NULL;

                }

            }



            free( st_ivas->hMasaIsmData->delayBuffer );

            st_ivas->hMasaIsmData->delayBuffer = NULL;

        }

    }



    if ( st_ivas->hIsmRendererData != NULL )

    {

        if ( st_ivas->hIsmRendererData->interpolator != NULL )
@@ -447,13 +449,14 @@ ivas_error ivas_masa_ism_separate_object_renderer_close( 
            free( st_ivas->hIsmRendererData->interpolator );

            st_ivas->hIsmRendererData->interpolator = NULL;

        }



        free( st_ivas->hIsmRendererData );

        st_ivas->hIsmRendererData = NULL;

    }



    return IVAS_ERR_OK;

    return;

}

#endif





/*-------------------------------------------------------------------------*

 * ivas_masa_ism_separate_object_render()

lib_dec/ivas_omasa_dec.c

+4 −26
Original line number Diff line number Diff line
@@ -329,19 +329,8 @@ ivas_error ivas_omasa_dec_config( 
                    st_ivas->hHrtfTD = NULL;

                }



#ifdef OMASA_OBJ_REND_CLOSE

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

                {

                    return error;

                }

#else

                /* ISM renderer handle */

                if ( st_ivas->hIsmRendererData != NULL )

                {

                    free( st_ivas->hIsmRendererData );

                    st_ivas->hIsmRendererData = NULL;

                }

#endif

                /* ISM renderer handle + ISM data handle */

                ivas_masa_ism_separate_object_renderer_close( st_ivas );

            }

        }
@@ -362,19 +351,8 @@ ivas_error ivas_omasa_dec_config( 
            }

            else

            {

#ifdef OMASA_OBJ_REND_CLOSE

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

                {

                    return error;

                }

#else

                /* ISM renderer handle */

                if ( st_ivas->hIsmRendererData != NULL )

                {

                    free( st_ivas->hIsmRendererData );

                    st_ivas->hIsmRendererData = NULL;

                }

#endif

                /* ISM renderer handle + ISM data handle */

                ivas_masa_ism_separate_object_renderer_close( st_ivas );

            }

        }