Commit 4b4f6041 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1547_basop_cleanup' into 'main-pc' 

Port MR 1346 from float to main-pc

See merge request !1518
parents 35349260 7a0c4e2b

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -1289,7 +1289,6 @@ static bool parseCmdlIVAS_dec( 
     * Mandatory input arguments

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



#ifdef FIX_956_DECODER_COMMAND_LINE_FIX

    if ( i < argc - 4 )

    {

        for ( i = 1; i < argc; i++ )
@@ -1307,9 +1306,6 @@ static bool parseCmdlIVAS_dec( 
        return false;

    }

    else if ( i < argc - 3 )

#else

    if ( i < argc - 3 )

#endif

    {

        arg->outputConfig = cmdline2config( argv[i] );

        if ( arg->outputConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

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 −5
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
#define BASOP_NOGLOB_DECLARE_LOCAL

#endif



#define FIX_954_OTR_REF_VEC                             /* FhG: Fix forward vector direction for OTR REF VEC mode */

#define FIX_867_CLDFB_NRG_SCALE



#define FIX_1378_ACELP_OUT_OF_BOUNDS
@@ -94,15 +93,11 @@ 
#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 FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */

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

#define FIX_955_FASTCONV_REND_IN_ISM                    /* VA: put FastConv rendering call under DEBUGGING */

#define NONBE_FIX_967_ISM_MONO_DMX                      /* FhG: issue 967: accumulating energies in ISM mono DMX */



#define FIX_956_DECODER_COMMAND_LINE_FIX                /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */

#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -1952,14 +1952,6 @@ ivas_error ivas_jbm_dec_render_fx( 
            {

                ivas_dirac_dec_binaural_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output_fx );

            }

#ifndef FIX_957_REMOVE_PANNING_DEAD_CODE

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_NON_DIEGETIC_DOWNMIX ) )

            {

                *nSamplesRendered = s_min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

                move16();

                ivas_apply_non_diegetic_panning_fx( p_output_fx, st_ivas->hDecoderConfig->non_diegetic_pan_gain_fx, *nSamplesRendered );

            }

#endif

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_PARAM_ISM ) || EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )

            {

                ivas_param_ism_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx );
@@ -2263,12 +2255,10 @@ ivas_error ivas_jbm_dec_render_fx( 
    ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) )

    {



#ifdef NONBE_FIX_949_MC_5MS_FRAMING

        FOR( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ )

        {

            p_tc_fx[n] = &st_ivas->hTcBuffer->tc_fx[n][st_ivas->hTcBuffer->n_samples_rendered];

        }

#endif



        IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCT ) )

        {

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