Commit a3e04379 authored by vaclav's avatar vaclav
Browse files

merge OMASA_BRATE_SW into MASA_AND_OBJECTS

parent 8e0a95cc

lib_com/ivas_ism_com.c

+2 −2
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ ISM_MODE ivas_ism_mode_select( 


void ivas_ism_metadata_close(

    ISM_METADATA_HANDLE hIsmMetaData[] /* i/o  : object metadata handles            */

#ifdef OMASA_BRATE_SW

#ifdef MASA_AND_OBJECTS

    ,

    const int16_t first_idx /* i  : index of first handle to deallocate  */

#endif
@@ -619,7 +619,7 @@ void ivas_ism_metadata_close( 
        return;

    }



#ifdef OMASA_BRATE_SW

#ifdef MASA_AND_OBJECTS

    for ( n = first_idx; n < MAX_NUM_OBJECTS; n++ )

#else

    for ( n = 0; n < MAX_NUM_OBJECTS; n++ )

lib_com/ivas_omasa_com.c

+0 −2
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ ISM_MODE ivas_omasa_ism_mode_select( 
}





#ifdef OMASA_BRATE_SW

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

 * ivas_set_omasa_TC()

 *
@@ -221,7 +220,6 @@ void ivas_set_omasa_TC( 


    return;

}

#endif





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

lib_com/ivas_prot.h

+5 −5
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ void ivas_param_ism_enc_close( 


void ivas_ism_metadata_close(

    ISM_METADATA_HANDLE hIsmMetaData[]                          /* i/o  : object metadata handles                   */

#ifdef OMASA_BRATE_SW

#ifdef MASA_AND_OBJECTS

    ,

    const int16_t first_idx /* i  : index of first handle to deallocate  */

#endif
@@ -5135,7 +5135,7 @@ void ivas_omasa_enc_close( 
#endif

);



#ifdef OMASA_BRATE_SW

#ifdef MASA_AND_OBJECTS

ivas_error ivas_omasa_enc_config(

    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */

);
@@ -5149,7 +5149,7 @@ void ivas_omasa_set_config( 
    OMASA_ENC_HANDLE hOMasa,                                    /* i/o: OMASA encoder handle                    */

    MASA_ENCODER_HANDLE hMasa,                                  /* i  : MASA encoder handle                     */

    const int32_t input_Fs,                                     /* i  : Input sample rate                       */

    const ISM_MODE ismMode                                      /* i   : ISM mode                               */

    const ISM_MODE ism_mode                                     /* i   : ISM mode                               */

);



void ivas_omasa_enc(
@@ -5211,7 +5211,7 @@ ISM_MODE ivas_omasa_ism_mode_select( 
    const int16_t nchan_ism                                     /* i  : number of input ISM's                   */

);



#ifdef OMASA_BRATE_SW

#ifdef MASA_AND_OBJECTS

void ivas_set_omasa_TC(

    const ISM_MODE ism_mode,                                    /* i  : ISM mode                                */

    const int16_t nchan_ism,                                    /* i  : number of input ISMs                    */
@@ -5232,7 +5232,7 @@ ivas_error ivas_masa_ism_data_open( 
    Decoder_Struct* st_ivas                                     /* i/o: IVAS decoder handle                     */

);



#ifdef OMASA_BRATE_SW

#ifdef MASA_AND_OBJECTS

void ivas_masa_ism_data_close(

    MASA_ISM_DATA_HANDLE *hMasaIsmData                          /* i/o: MASA_ISM rendering handle               */

);

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ 
#ifdef MASA_AND_OBJECTS

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

#define OMASA_UPDATES                                   /* Nokia: Updates to the OMASA processing */

#define OMASA_BRATE_SW                  /* VA: support of bitrate switching in OMASA format */

#define FIX_TD5_IN_OMASA                // do not transmit extended MD in OMASA

#define OMASA_TUNING_TD_STEREO          /* VA: tuning of TD stereo in OMASA format */

#define FIX_OMASA_DELAY_COMP                            /* Nokia: OMASA audio/meta delay compensation */

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ ivas_error ivas_dec( 
        st_ivas->ini_active_frame++;

    }



#ifdef OMASA_BRATE_SW

#ifdef MASA_AND_OBJECTS

    st_ivas->last_ivas_format = st_ivas->ivas_format;

#endif