Commit 4231c17b authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

parent 371c483e

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -360,9 +360,7 @@ typedef enum 
#define ISM_Q_STEP_BORDER                       5.0f

#define ISM_Q_STEP_BORDER_FX                    ( 20971520 )    // Q22



#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

#define ISM_FEC_MAX                             10

#endif



#define ISM_RADIUS_NBITS                        6 

#define ISM_RADIUS_MIN                          0.0f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ 
#define FIX_1372_ISAR_POST_REND

#endif

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA           /* Nokia: issue 944: fix FEC error in OMASA */

#define NONBE_FIX_949_MC_5MS_FRAMING                    /*Dlb: Issue 949: fix for 5ms framing/rendering in MC mode */

#define NONBE_FIX_952_MC_PARAMUPMIX_5MS                 /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/

#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER     /* Qualcomm: issue 953: fix order or ER channels in LC mode*/

lib_enc/ivas_ism_metadata_enc_fx.c

+0 −3
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ 
#define ISM_MAX_ELEVATION_DIFF_IDX ( ISM_ELEVATION_NBITS - 1 /*zero*/ - 1 /*sign*/ )

#define ISM_MAX_RADIUS_DIFF_IDX    ( ISM_RADIUS_NBITS - 1 /*zero*/ - 1 /*sign*/ )



#ifndef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

#define ISM_FEC_MAX 10

#endif

#define ISM_MD_FEC_DIFF         10

#define ISM_MD_FEC_DIFF_Q22     41943040

#define ISM_MD_INC_DIFF_CNT_MAX 6

lib_enc/ivas_omasa_enc_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -45,13 +45,11 @@ 
#endif





#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

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

 * Local constants

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



#define OMASA_FEC_MAX 5

#endif



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

 * Local function prototypes
@@ -192,10 +190,8 @@ ivas_error ivas_omasa_enc_open_fx( 


    hOMasa->prev_selected_object = 0;

    hOMasa->changing_object = 0;

#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

    hOMasa->since_obj_change_cnt = 0;

    move16();

#endif

    move16();

    move16();
@@ -661,7 +657,6 @@ void ivas_omasa_enc_fx( 
            move16();

        }



#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

        /* force absolute MD coding in case of change of separated object */

        IF( NE_16( hOMasa->prev_selected_object, selected_object ) )

        {
@@ -680,7 +675,6 @@ void ivas_omasa_enc_fx( 
                move16();

            }

        }

#endif

        hOMasa->prev_selected_object = selected_object;

        move16();

lib_enc/ivas_stat_enc.h

+0 −2
Original line number Diff line number Diff line
@@ -873,9 +873,7 @@ typedef struct ivas_omasa_enc_state_structure 


    Word16 prev_selected_object;

    UWord8 changing_object;

#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

    Word16 since_obj_change_cnt;

#endif



} OMASA_ENC_STATE, *OMASA_ENC_HANDLE;