Commit 0bf80e6c authored by vaclav's avatar vaclav
Browse files

- accept FIX_356_ISM_METADATA_SYNC_OMASA 

- fix compilation without MASA_AND_OBJECTS
parent 6c4ccc90

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ 
#define MASA_AND_OBJECTS                                /* Nokia: Combination of MASA and objects */

#ifdef MASA_AND_OBJECTS

#define MASAISM_EDIT_OBJECTS                            /* Nokia: Temporary command line editing of object directions in the decoder */

#define FIX_356_ISM_METADATA_SYNC_OMASA // temp. fix

#endif



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

lib_dec/ivas_init_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -784,11 +784,14 @@ ivas_error ivas_init_decoder( 


    if ( output_config == AUDIO_CONFIG_EXTERNAL )

    {

#ifdef MASA_AND_OBJECTS

        if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        {

            hDecoderConfig->nchan_out = st_ivas->nchan_transport + st_ivas->nchan_ism;

        }

        else if ( !( st_ivas->ism_mode == ISM_MODE_PARAM ) )

        else

#endif

            if ( !( st_ivas->ism_mode == ISM_MODE_PARAM ) )

        {

            hDecoderConfig->nchan_out = st_ivas->nchan_transport;

        }
@@ -2583,6 +2586,7 @@ static ivas_error doSanityChecks_IVAS( 
        }

    }



#ifdef MASA_AND_OBJECTS

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

    {

        if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC && output_config == AUDIO_CONFIG_EXTERNAL )
@@ -2590,6 +2594,7 @@ static ivas_error doSanityChecks_IVAS( 
            return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for combined MASA and ISM format" );

        }

    }

#endif



#ifdef DEBUGGING

    if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || ( output_config != AUDIO_CONFIG_BINAURAL && output_config != AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) )

lib_dec/ivas_masa_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -571,7 +571,11 @@ ivas_error ivas_masa_decode( 
        }

    }



#ifdef MASA_AND_OBJECTS

    if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

#else

    if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

#endif

    {

        create_masa_ext_out_meta( hMasa, hQMetaData, st_ivas->nchan_transport );

    }

lib_dec/ivas_objectRenderer_internal.c

+2 −2
Original line number Diff line number Diff line
@@ -107,10 +107,10 @@ ivas_error ivas_td_binaural_renderer( 
        ism_md_subframe_update = 2;

    }



#ifdef FIX_356_ISM_METADATA_SYNC_OMASA

#ifdef MASA_AND_OBJECTS

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

    {

        ism_md_subframe_update = 0;

        ism_md_subframe_update = 0; // ToDo (for Mikko-Ville): verify whether it should not be 2

    }

#endif

lib_dec/ivas_omasa_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ ivas_error ivas_omasa_dec_config( 
        {

            return error;

        }



    }



    return IVAS_ERR_OK;