Commit f69a7dcb authored by vaclav's avatar vaclav
Browse files

merge OMASA_TUNING_TD_STEREO and FIX_TD5_IN_OMASA into MASA_AND_OBJECTS

parent a3e04379

lib_com/ivas_prot.h

+4 −4
Original line number Diff line number Diff line
@@ -1778,7 +1778,7 @@ void stereo_tdm_prep_dwnmx ( 
);



int16_t stereo_tdm_ener_analysis(

#ifdef OMASA_TUNING_TD_STEREO

#ifdef MASA_AND_OBJECTS

    const int16_t ivas_format,                                  /* i  : IVAS format                             */

#endif

    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE structure                           */
@@ -1803,7 +1803,7 @@ void stereo_td_init_dec( 
);



void tdm_configure_dec(

#ifdef OMASA_TUNING_TD_STEREO

#ifdef MASA_AND_OBJECTS

    const int16_t ivas_format,                                  /* i  : IVAS format                             */

#endif

    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */
@@ -1855,7 +1855,7 @@ void tdm_ol_pitch_comparison( 
);



void tdm_configure_enc(

#ifdef OMASA_TUNING_TD_STEREO

#ifdef MASA_AND_OBJECTS

    const int16_t ivas_format,                                  /* i  : IVAS format                             */

#endif

    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE encoder structure                   */
@@ -1874,7 +1874,7 @@ ivas_error signaling_enc_secondary( 
);



void tdm_bit_alloc(

#ifdef OMASA_TUNING_TD_STEREO

#ifdef MASA_AND_OBJECTS

    const int16_t ivas_format,                                  /* i  : IVAS format                             */

#endif

    const int32_t element_brate_wo_meta,                        /* i  : element bitrate without metadata        */

lib_com/ivas_stereo_td_bit_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
 *-------------------------------------------------------------------*/



void tdm_bit_alloc(

#ifdef OMASA_TUNING_TD_STEREO

#ifdef MASA_AND_OBJECTS

    const int16_t ivas_format, /* i  : IVAS format                         */

#endif

    const int32_t element_brate_wo_meta, /* i  : element bitrate without metadata    */
@@ -139,7 +139,7 @@ void tdm_bit_alloc( 
    *total_brate_sec = tdm_bit_allc_tbl[idx][coder_type];



    /* secondary channel bitrate allocation based on the energy scaling ratio */

#ifdef OMASA_TUNING_TD_STEREO

#ifdef MASA_AND_OBJECTS

    if ( ( ivas_format != MASA_ISM_FORMAT && ( ( coder_type != UNVOICED ) || tdm_LRTD_flag == 1 ) ) || ( ivas_format == MASA_ISM_FORMAT && coder_type > UNVOICED ) )

#else

    if ( ( coder_type != UNVOICED ) || tdm_LRTD_flag == 1 )

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -169,8 +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 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 */



#endif  /* MASA_AND_OBJECTS */

lib_dec/ivas_cpe_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ ivas_error ivas_cpe_dec( 
        if ( !st_ivas->bfi )

        {

            tdm_configure_dec(

#ifdef OMASA_TUNING_TD_STEREO

#ifdef MASA_AND_OBJECTS

                st_ivas->ivas_format,

#endif

                hCPE, &tdm_ratio_idx, nb_bits_metadata );

lib_dec/ivas_ism_metadata_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ ivas_error ivas_ism_metadata_dec( 
        }



        /* read extended metadata presence flag */

#ifdef FIX_TD5_IN_OMASA

#ifdef MASA_AND_OBJECTS

        if ( ism_mode == ISM_MODE_DISC && ism_total_brate >= ISM_EXTENDED_METADATA_BRATE )

#else

        if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE )