Commit 7d92eb6a authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

parent 5b3c1501

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -320,9 +320,7 @@ typedef enum 
#define ISM_Q_STEP                              2.5f

#define ISM_Q_STEP_BORDER                       5.0f



#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
@@ -181,7 +181,6 @@ 
#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#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.c

+0 −3
Original line number Diff line number Diff line
@@ -55,9 +55,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_INC_DIFF_CNT_MAX  6

#define ISM_MD_FEC_CNT_MAX       25

lib_enc/ivas_omasa_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -45,13 +45,11 @@ 
#include "wmc_auto.h"





#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

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

 * Local constants

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



#define OMASA_FEC_MAX 5

#endif



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

 * Local function prototypes
@@ -141,9 +139,7 @@ ivas_error ivas_omasa_enc_open( 
    set_zero( hOMasa->broadband_energy_prev, MAX_NUM_OBJECTS + MASA_MAX_TRANSPORT_CHANNELS );

    hOMasa->prev_selected_object = 0;

    hOMasa->changing_object = 0;

#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

    hOMasa->since_obj_change_cnt = 0;

#endif



    input_frame = (int16_t) ( st_ivas->hEncoderConfig->input_Fs / FRAMES_PER_SEC );

    for ( i = 0; i < input_frame; i++ )
@@ -507,7 +503,6 @@ void ivas_omasa_enc( 
            hOMasa->broadband_energy_prev[i] = broadband_energy[i];

        }



#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

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

        if ( hOMasa->prev_selected_object != selected_object )

        {
@@ -523,7 +518,6 @@ void ivas_omasa_enc( 
                hIsmMeta[0]->position_angle.angle1_diff_cnt = ISM_FEC_MAX;

            }

        }

#endif

        hOMasa->prev_selected_object = selected_object;



        /* Separate the selected object */

lib_enc/ivas_stat_enc.h

+0 −2
Original line number Diff line number Diff line
@@ -792,9 +792,7 @@ typedef struct ivas_omasa_enc_state_structure 
    float broadband_energy_prev[MAX_NUM_OBJECTS + MASA_MAX_TRANSPORT_CHANNELS];

    int16_t prev_selected_object;

    uint8_t changing_object;

#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA

    int16_t since_obj_change_cnt;

#endif

    float fade_out_gain[L_FRAME48k];

    float fade_in_gain[L_FRAME48k];