Commit aeaa156d authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'main' into dlb_split_rend_lcld_5ms

parents c26c2f3b c82d74b4

apps/decoder.c

+20 −0
Original line number Diff line number Diff line
@@ -1653,7 +1653,27 @@ static bool parseCmdlIVAS_dec( 
     * Mandatory input arguments

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



#ifdef FIX_956_DECODER_COMMAND_LINE_FIX

    if ( i < argc - 4 )

    {

        for ( i = 1; i < argc; i++ )

        {

            if ( argv[i][0] == '-' )

            {

                fprintf( stderr, "Error: Wrong order of command-line arguments (optional arguments are first)\n\n" );

                usage_dec();

                return false;

            }

        }



        fprintf( stderr, "Error: Too many mandatory command-line arguments\n\n" );

        usage_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/options.h

+4 −0
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ 
#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange: Missing left/right and coherence late reverb tables in binary format*/

#define FIX_OLD_BINARY_FORMAT                           /* Orange: temporary to maintain bitexactness */

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

#define FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION     /* Ericsson: Fix related to issue 667 in IVAS BASOP. Handling of initial lost frame in IVAS causes non-BE on EVS BASOP 26.444 */ 

#define FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */

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



/* #################### End BE switches ################################## */
@@ -168,6 +171,7 @@ 
#define NONBE_FIX_AVG_IAC_CLDFB_REVERB                        /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */

#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

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

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

#define NONBE_FIX_949_MC_5MS_FRAMING                          /* Dlb: issue 949: fix for issue 949, distorted output in MC mode with 5ms framing*/



#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_dec/ivas_jbm_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -1030,11 +1030,13 @@ ivas_error ivas_jbm_dec_render( 
            {

                ivas_dirac_dec_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output );

            }

#ifndef FIX_957_REMOVE_PANNING_DEAD_CODE

            else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )

            {

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

                ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

            }

#endif

            else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

            {

                ivas_param_ism_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );

lib_dec/lib_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -216,6 +216,9 @@ ivas_error IVAS_DEC_Open( 
        st_ivas->transport_config = IVAS_AUDIO_CONFIG_INVALID;

        st_ivas->intern_config = IVAS_AUDIO_CONFIG_INVALID;

        st_ivas->writeFECoffset = 0;

#ifdef FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION

        hIvasDec->hasDecodedFirstGoodFrame = true; /* Functionality to suppress output for initial lost frames is disabled in EVS operation */

#endif



        return IVAS_ERR_OK;

    }

lib_rend/ivas_reflections.c

+8 −1
Original line number Diff line number Diff line
@@ -59,10 +59,17 @@ static uint16_t LC_mixing_7_1[7] = { 0, 1, 2, 3, 4, 3, 4 }; 


static uint16_t LC_mixing_5_1_2[7] = { 0, 1, 2, 3, 4, 0, 1 };



#ifdef NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER

static uint16_t LC_mixing_5_1_4[9] = { 0, 1, 2, 3, 4, 0, 1, 3, 4 };

#else

static uint16_t LC_mixing_5_1_4[9] = { 0, 1, 2, 3, 4, 0, 1, 2, 3 };

#endif



#ifdef NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER

static uint16_t LC_mixing_7_1_4[11] = { 0, 1, 2, 3, 4, 3, 4, 0, 1, 3, 4 };

#else

static uint16_t LC_mixing_7_1_4[11] = { 0, 1, 2, 3, 4, 3, 4, 0, 1, 2, 3 };



#endif



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

 * Function ivas_er_init()