Commit f8541b64 authored by malenovsky's avatar malenovsky
Browse files

Merge branch '1082-instrumentation-build-failing-due-to-lc3plus' into 'main' 

Resolve "Instrumentation build failing due to LC3Plus"

See merge request !1540
parents 7b01eae7 f5110209

lib_com/options.h

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


#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */



#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */



#define FIX_1077_MEMORY_TEST_MISSING                    /* orange: issue 1077 : add missing memory test*/

#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */

lib_dec/ivas_dirac_dec.c

+4 −3
Original line number Diff line number Diff line
@@ -925,10 +925,11 @@ ivas_error ivas_dirac_dec_config( 


                        ivas_dirac_dec_get_frequency_axis( frequency_axis, st_ivas->hDecoderConfig->output_Fs, st_ivas->hSpatParamRendCom->num_freq_bands );



                        if ( ( error = ivas_dirac_dec_decorr_open(

#ifdef SPLIT_REND_WITH_HEAD_ROT

                        if ( ( error = ivas_dirac_dec_decorr_open( &( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_params ), &( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_state ), st_ivas->hSpatParamRendCom->num_freq_bands, BINAURAL_CHANNELS, BINAURAL_CHANNELS,

                                   &( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_params ), &( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_state ), st_ivas->hSpatParamRendCom->num_freq_bands, BINAURAL_CHANNELS, BINAURAL_CHANNELS,

#else

                        if ( ( error = ivas_dirac_dec_decorr_open( &( st_ivas->hDiracDecBin->h_freq_domain_decorr_ap_params ), &( st_ivas->hDiracDecBin->h_freq_domain_decorr_ap_state ), st_ivas->hSpatParamRendCom->num_freq_bands, BINAURAL_CHANNELS, BINAURAL_CHANNELS,

                                   &( st_ivas->hDiracDecBin->h_freq_domain_decorr_ap_params ), &( st_ivas->hDiracDecBin->h_freq_domain_decorr_ap_state ), st_ivas->hSpatParamRendCom->num_freq_bands, BINAURAL_CHANNELS, BINAURAL_CHANNELS,

#endif

                                   DIRAC_SYNTHESIS_PSD_LS, frequency_axis, BINAURAL_CHANNELS, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                        {

lib_dec/ivas_masa_dec.c

+5 −6
Original line number Diff line number Diff line
@@ -1413,18 +1413,17 @@ ivas_error ivas_masa_dec_reconfigure( 
    {

        if ( st_ivas->hDiracDecBin[pos_idx] != NULL )

        {

#else

    if ( st_ivas->hDiracDecBin != NULL )

    {

#endif

            /* regularization factor is bitrate-dependent */

#ifdef SPLIT_REND_WITH_HEAD_ROT

            st_ivas->hDiracDecBin[pos_idx]->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate );

        }

    }

#else

    if ( st_ivas->hDiracDecBin != NULL )

    {

        /* regularization factor is bitrate-dependent */

        st_ivas->hDiracDecBin->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate );

#endif

    }

#endif



    if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->last_ivas_format == MASA_FORMAT ) /* note: switching within OMASA is handled in ivas_omasa_dec_config() */

    {

lib_dec/ivas_sba_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -570,6 +570,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        {

            return error;

        }

    }

#else

    if ( st_ivas->hDiracDecBin != NULL )

    {
@@ -577,8 +578,8 @@ ivas_error ivas_sba_dec_reconfigure( 
        {

            return error;

        }

#endif

    }

#endif



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

     * CLDFB instances

lib_isar/isar_lcld_rom_tables.c

deleted100644 → 0
+0 −19855

File deleted.

Preview size limit exceeded, changes collapsed.