Commit d4f387e3 authored by lefort's avatar lefort
Browse files

Merge branch 'float-pc' into 1522_ref_PortFlpMR1349

parents cdc88657 36f33dd8

apps/decoder.c

+20 −0
Original line number Diff line number Diff line
@@ -1508,7 +1508,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

+3 −0
Original line number Diff line number Diff line
@@ -187,6 +187,9 @@ 
#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_956_DECODER_COMMAND_LINE_FIX                /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */

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

#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 BE_FIX_567_DOUBLE_STEREO_DMX                          /* NTT: Fix formal issues */   

#define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */

lib_dec/ivas_jbm_dec.c

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

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

            }



#ifdef FIX_955_FASTCONV_REND_IN_ISM

#ifdef DEBUGGING

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

#else

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

#endif

            {

                /* Convert to Ambisonics */

                ivas_ism2sba_sf( st_ivas->hTcBuffer->tc, p_output, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );

            }

#else

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

            {

                /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */

                ivas_ism2sba_sf( st_ivas->hTcBuffer->tc, p_output, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );

            }

#endif



            /* Binaural rendering */

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )

lib_dec/lib_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -221,6 +221,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;

    }