Commit ca6d7a51 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

update LC3plus integration script and remove unsupported frame durations from helper func

parent 17e581b0

lib_isar/isar_lc3plus_common.c

+0 −6
Original line number Diff line number Diff line
@@ -104,16 +104,10 @@ LC3PLUS_FrameDuration IVAS_LC3PLUS_UsToLC3plusFrameDuration( 
{

    switch ( lc3PlusFrameDurationUs )

    {

#ifdef CR9_C_ADD_1p25MS /* TODO LC3plus: verify switch stripping on update */

        case 1250:

            return LC3PLUS_FRAME_DURATION_1p25MS;

#endif

        case 2500:

            return LC3PLUS_FRAME_DURATION_2p5MS;

        case 5000:

            return LC3PLUS_FRAME_DURATION_5MS;

        case 7500:

            return LC3PLUS_FRAME_DURATION_7p5MS;

        case 10000:

            return LC3PLUS_FRAME_DURATION_10MS;

        default:

lib_lc3plus/.clang-format

+1 −0
Original line number Diff line number Diff line 


DisableFormat: true

SortIncludes: Never

lib_lc3plus/defines.h

+0 −2
Original line number Diff line number Diff line
@@ -389,8 +389,6 @@ typedef int32_t LC3_INT32; 


#endif /* CR9_C_ADD_1p25MS */



/* RESIDUAL CODING */

#define NPRM_RESQ 5 * MAX_LEN



/* MDCT */

#define MDCT_MEM_LEN_MAX (MAX_LEN - ((180 * MAX_LEN) / 480))

lib_lc3plus/lc3plus.h

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


#include "options.h"

#include "wmc_auto.h"

#define CR9_C_ADD_1p25MS /* including defines.h redefines NPRM_RESQ */

#include "defines.h" /* Required for CR9_C_ADD_1p25MS */



#ifndef _MSC_VER

#include <stdint.h>

scripts/lc3plus_lib_setup/get_lc3plus.sh

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ find lib_lc3plus -name '*.[ch]' -type f -print0 | 
    xargs -0 -I {} \

        sed -i 's/^#[[:space:]]\+/#/' {}



# define CR9_C_ADD_1p25MS manually to avoid redefinition of NPRM_RESQ

sed -i 's|#include "defines\.h" /\* Required for CR9_C_ADD_1p25MS \*/|#define CR9_C_ADD_1p25MS /\* including defines.h redefines NPRM_RESQ, so define this here manually \*/|' lib_lc3plus/lc3plus.h

# delete define of NPRM_RESQ - not used anywhere in LC3plus but conflicts with IVAS

sed -i '/^\/\* RESIDUAL CODING \*\/$/d; /^#define NPRM_RESQ 5 \* MAX_LEN$/d' lib_lc3plus/defines.h



# Add .clang-format file to lib_lc3plus to disable formatting there

printf "Disabling clang-format in lib_lc3plus directory\n"