Commit 643ad52c authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'lc3plus-v161-update-ivas-float-update' into 'ivas-float-update' 

[ivas-float-update][split-non-BE] Update LC3plus version to v1.6.1

See merge request !2478
parents 31073441 c34cfc8f

Workspace_msvc/lib_lc3plus.vcxproj

+9 −8
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
    <ClCompile Include="..\lib_lc3plus\attack_detector.c" />

    <ClCompile Include="..\lib_lc3plus\plc_compute_stab_fac.c" />

    <ClCompile Include="..\lib_lc3plus\constants.c" />

    <ClCompile Include="..\lib_lc3plus\com_entropy.c" />

    <ClCompile Include="..\lib_lc3plus\cutoff_bandwidth.c" />

    <ClCompile Include="..\lib_lc3plus\dct4.c" />

    <ClCompile Include="..\lib_lc3plus\dec_entropy.c" />
@@ -116,7 +117,7 @@ 
    <ClCompile Include="..\lib_lc3plus\estimate_global_gain.c" />

    <ClCompile Include="..\lib_lc3plus\lc3plus_fft.c" />

    <ClCompile Include="..\lib_lc3plus\imdct.c" />

    <ClCompile Include="..\lib_lc3plus\lc3.c" />

    <ClCompile Include="..\lib_lc3plus\lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\ltpf_coder.c" />

    <ClCompile Include="..\lib_lc3plus\ltpf_decoder.c" />

    <ClCompile Include="..\lib_lc3plus\mdct.c" />
@@ -153,9 +154,9 @@ 
    <ClCompile Include="..\lib_lc3plus\resamp12k8.c" />

    <ClCompile Include="..\lib_lc3plus\residual_coding.c" />

    <ClCompile Include="..\lib_lc3plus\residual_decoding.c" />

    <ClCompile Include="..\lib_lc3plus\setup_dec_lc3.c" />

    <ClCompile Include="..\lib_lc3plus\setup_enc_lc3.c" />

    <ClCompile Include="..\lib_lc3plus\setup_com_lc3.c" />

    <ClCompile Include="..\lib_lc3plus\setup_dec_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\setup_enc_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\setup_com_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\sns_compute_scf.c" />

    <ClCompile Include="..\lib_lc3plus\sns_interpolate_scf.c" />

    <ClCompile Include="..\lib_lc3plus\sns_quantize_scf.c" />
@@ -169,9 +170,9 @@ 
    <ClInclude Include="..\lib_lc3plus\defines.h" />

    <ClInclude Include="..\lib_lc3plus\file_io.h" />

    <ClInclude Include="..\lib_lc3plus\functions.h" />

    <ClInclude Include="..\lib_lc3plus\lc3.h" />

    <ClInclude Include="..\lib_lc3plus\setup_dec_lc3.h" />

    <ClInclude Include="..\lib_lc3plus\setup_enc_lc3.h" />

    <ClInclude Include="..\lib_lc3plus\lc3plus.h" />

    <ClInclude Include="..\lib_lc3plus\setup_dec_lc3plus.h" />

    <ClInclude Include="..\lib_lc3plus\setup_enc_lc3plus.h" />

    <ClInclude Include="..\lib_lc3plus\structs.h" />

    <ClInclude Include="..\lib_lc3plus\tinywavein_c.h" />

    <ClInclude Include="..\lib_lc3plus\tinywaveout_c.h" />

lib_isar/isar_lc3plus_common.c

+32 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "options.h"

#include "isar_lc3plus_common.h"

#include "ivas_error.h"

#include "lc3.h"

#include "lc3plus.h"



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

 * Function ISAR_LC3PLUS_LC3plusErrToIvasErr()
@@ -57,6 +57,13 @@ ivas_error ISAR_LC3PLUS_LC3plusErrToIvasErr( 
    return IVAS_ERR_INTERNAL;

}





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

 * Function IVAS_LC3PLUS_LC3plusRtpErrToIvasErr()

 *

 *

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



ivas_error IVAS_LC3PLUS_LC3plusRtpErrToIvasErr(

    const LC3PLUS_RTP_ERR lc3PlusRtpError )

{
@@ -85,3 +92,27 @@ ivas_error IVAS_LC3PLUS_LC3plusRtpErrToIvasErr( 


    return IVAS_ERR_UNKNOWN;

}



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

 * Function IVAS_LC3PLUS_UsToLC3plusFrameDuration()

 *

 *

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



LC3PLUS_FrameDuration IVAS_LC3PLUS_UsToLC3plusFrameDuration(

    const int16_t lc3PlusFrameDurationUs )

{

    switch ( lc3PlusFrameDurationUs )

    {

        case 2500:

            return LC3PLUS_FRAME_DURATION_2p5MS;

        case 5000:

            return LC3PLUS_FRAME_DURATION_5MS;

        case 10000:

            return LC3PLUS_FRAME_DURATION_10MS;

        default:

            break;

    }



    return LC3PLUS_FRAME_DURATION_UNDEFINED;

}

lib_isar/isar_lc3plus_common.h

+5 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <stdint.h>

#include "options.h"

#include "ivas_error.h"

#include "lc3.h"

#include "lc3plus.h"

#include "isar_lc3plus_payload.h"



/*! common configuration parameters between encoder and decoder */
@@ -45,7 +45,7 @@ typedef struct LC3PLUS_CONFIG 
{

    /*! frame duration in microseconds [10000, 5000, 2500] */

    int16_t lc3plus_frame_duration_us;

    /*! isar frame duration in microseconds [20000, 10000, 5000] */

    /*! ISAR frame duration in microseconds [20000, 10000, 5000] */

    int16_t isar_frame_duration_us;

    /*! sampling rate*/

    int32_t samplerate;
@@ -61,4 +61,7 @@ ivas_error ISAR_LC3PLUS_LC3plusErrToIvasErr( const LC3PLUS_Error lc3PlusError ); 
/*! utility function to convert LC3PLUS_Errors to the suitable ivas_error */

ivas_error IVAS_LC3PLUS_LC3plusRtpErrToIvasErr( const LC3PLUS_RTP_ERR lc3PlusRtpError );



/*! utility function to convert a value in microseconds to an LC3PLUS_FrameDuration */

LC3PLUS_FrameDuration IVAS_LC3PLUS_UsToLC3plusFrameDuration( const int16_t lc3PlusFrameDuration );



#endif /* ISAR_LC3PLUS_COM_H */

lib_isar/isar_lc3plus_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "ivas_prot.h"

#include "isar_lc3plus_dec.h"

#include "isar_lc3plus_common.h"

#include "lc3.h"

#include "lc3plus.h"

#include "ivas_error_utils.h"

#include "wmc_auto.h"
@@ -135,7 +135,7 @@ ivas_error ISAR_LC3PLUS_DEC_Open( 
            return IVAS_ERROR( ISAR_LC3PLUS_LC3plusErrToIvasErr( err ), "lc3plus_dec_init failed\n" );

        }



        err = lc3plus_dec_set_frame_dms( ( *handle )->handles[iCh], config.lc3plus_frame_duration_us / 100 );

        err = lc3plus_dec_set_frame_dms( ( *handle )->handles[iCh], IVAS_LC3PLUS_UsToLC3plusFrameDuration( config.lc3plus_frame_duration_us ) );

        if ( LC3PLUS_OK != err )

        {

            ISAR_LC3PLUS_DEC_Close( handle );

lib_isar/isar_lc3plus_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


#include <stdint.h>

#include "options.h"

#include "lc3.h"

#include "lc3plus.h"

#include "ivas_error.h"

#include "ivas_cnst.h"

#include "isar_lc3plus_common.h"