Commit aeb62e4a authored by vaclav's avatar vaclav
Browse files

accept NONBE_1118_EVS_LR_HQ_BITERROR and NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

parent cabb1ba4

lib_com/ivas_prot.h

+1 −3
Original line number Diff line number Diff line
@@ -5794,14 +5794,12 @@ void ivas_omasa_render_objects_from_mix( 
    const int16_t output_frame                                  /* i  : output frame length per channel        */

);



#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

void ivas_omasa_gain_masa_tc(

    float *output[],                                            /* i/o: output synthesis signal                 */

    const float gainMasa,                                       /* i  : gain for MASA transport channels        */

    const int16_t nchan_transport_ism,                          /* i  : number of ISM TCs                       */

    const int16_t output_frame                                  /* i  : output frame length per channel         */

);

#endif



void ivas_omasa_dirac_rend_jbm(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ 


#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_1118_EVS_LR_HQ_BITERROR                   /* VA: issue 1118: fix EVS decoder crash in LR-HQ in case of bit errors */

#define NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT               /* Nokia: issue 1305: Fix OMASA ext output in case of object editing */





/* ##################### End NON-BE switches ########################### */

lib_dec/hq_lr_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -635,7 +635,6 @@ void hq_lr_dec( 


            IF( sub( i, highband ) >= 0 )

            {

#ifdef NONBE_1118_EVS_LR_HQ_BITERROR

                /* safety check in case of bit errors */

                if ( Ep_fx[i] > 536788991 /* max(Q30) */ )

                {
@@ -644,12 +643,10 @@ void hq_lr_dec( 
                    return;

                }



#endif

                enerH_fx = L_add( enerH_fx, L_shl( Ep_fx[i], 2 ) ); /*Q0 */

            }

            ELSE IF( sub( i, lowband ) >= 0 )

            {

#ifdef NONBE_1118_EVS_LR_HQ_BITERROR

                /* safety check in case of bit errors */

                if ( Ep_fx[i] > 536788991 /* max(Q30) */ )

                {
@@ -658,7 +655,6 @@ void hq_lr_dec( 
                    return;

                }



#endif

                enerL_fx = L_add( enerL_fx, L_shl( Ep_fx[i], 2 ) ); /*Q0 */

            }

        }

lib_dec/ivas_jbm_dec.c

+2 −4
Original line number Diff line number Diff line
@@ -2842,13 +2842,12 @@ void ivas_dec_prepare_renderer( 
        {

            ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );

        }

#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT



        /* MASA transport gaining for edited disc OMASA EXT. For ISMs, only metadata is modified */

        if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->ism_mode == ISM_MASA_MODE_DISC && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hMasaIsmData->masa_gain_is_edited == 1 )

        {

            ivas_omasa_gain_masa_tc( st_ivas->hTcBuffer->tc, st_ivas->hMasaIsmData->gain_masa_edited, st_ivas->nchan_ism, st_ivas->hTcBuffer->n_samples_available );

        }

#endif

    }

    else if ( st_ivas->ivas_format == STEREO_FORMAT )

    {
@@ -2924,7 +2923,7 @@ void ivas_dec_prepare_renderer( 
            {

                ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );

            }

#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT



            /* MASA transport gaining for edited param_one OMASA EXT. For ISMs, only metadata is modified.  */

            if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->hMasaIsmData->masa_gain_is_edited == 1 )

            {
@@ -2933,7 +2932,6 @@ void ivas_dec_prepare_renderer( 
                    v_multc( st_ivas->hTcBuffer->tc[n], st_ivas->hMasaIsmData->gain_masa_edited, st_ivas->hTcBuffer->tc[n], st_ivas->hTcBuffer->n_samples_available );

                }

            }

#endif

        }

        else

        {

lib_dec/ivas_objectRenderer_internal.c

+2 −8
Original line number Diff line number Diff line
@@ -179,11 +179,7 @@ ivas_error ivas_td_binaural_renderer_sf( 


        if ( subframe_idx == ism_md_subframe_update_jbm )

        {

#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

            if ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT )

#else

            if ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT )

#endif

            {

                ISM_METADATA_FRAME ismMetaData[MAX_NUM_OBJECTS];

                ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS];
@@ -196,7 +192,7 @@ ivas_error ivas_td_binaural_renderer_sf( 
                    ismMetaData[nS].yaw = st_ivas->hIsmMetaData[nS]->edited_yaw;

                    ismMetaData[nS].pitch = st_ivas->hIsmMetaData[nS]->edited_pitch;

                    ismMetaData[nS].non_diegetic_flag = st_ivas->hIsmMetaData[nS]->non_diegetic_flag;

#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT



                    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

                    {

                        /* DISC OMASA ISM gaining with TDREND is done in ivas_dec_prepare_renderer()*/
@@ -206,9 +202,7 @@ ivas_error ivas_td_binaural_renderer_sf( 
                    {

                        ismMetaData[nS].gain = st_ivas->hIsmMetaData[nS]->edited_gain;

                    }

#else

                    ismMetaData[nS].gain = st_ivas->hIsmMetaData[nS]->edited_gain;

#endif



                    hIsmMetaData[nS] = &ismMetaData[nS];

                }