Commit 922595ae authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

update LC3plus integration script and code

parent ca6d7a51
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -77,8 +77,10 @@ static int lc3plus_frame_size_supported(LC3PLUS_FrameDuration frame_dms)
    case LC3PLUS_FRAME_DURATION_7p5MS: /* fallthru */
    case LC3PLUS_FRAME_DURATION_10MS:
            return 1;
    default: return 0;
    default: break;
    }

    return 0;
}

static int null_in_list(void **list, int n)
+8 −4
Original line number Diff line number Diff line
@@ -14,21 +14,25 @@
#ifdef CR9_C_ADD_1p25MS
static LC3_INT16 get_continuation (LC3_INT32 fading_case, LC3PLUS_FrameDuration frame_dms, LC3_INT32 pos, LC3_INT32 total) 
{
    LC3_INT16 retval;

    if ( frame_dms != LC3PLUS_FRAME_DURATION_1p25MS )
    {
        return 0;
        retval = 0;
    }
    else
    {
        if ( pos == total )
        {
            return 0;
            retval = 0;
        }
        else
        {
            return fading_case;
            retval = fading_case;
        }
    }
    
    return retval;
}
#endif

+4 −2
Original line number Diff line number Diff line
@@ -45,8 +45,10 @@ find lib_lc3plus -name '*.[ch]' -type f -print0 |
# Remove whitespace from preprocessor commands
printf "Removing whitespace from preprocessor commands\n"
find lib_lc3plus -name '*.[ch]' -type f -print0 |
    xargs -0 -I {} \
        sed -i 's/^#[[:space:]]\+/#/' {}
    xargs -0 -I {} sh -c '
        sed -i "s/^#[[:space:]]\+/#/" "$1"
        sed -i "s/^#\(define\|undef\|ifdef\|ifndef\|endif\|if\|else\|elif\|include\)[[:space:]]\+/#\1 /" "$1"
    ' _ {}

# 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
+4 −2
Original line number Diff line number Diff line
@@ -162,8 +162,10 @@ find lib_lc3plus -name '*.[ch]' -type f -print0 |
# Remove whitespace from preprocessor commands
printf "Removing whitespace from preprocessor commands\n"
find lib_lc3plus -name '*.[ch]' -type f -print0 |
	xargs -0 -I {} \
		sed -i 's/^#[[:space:]]\+/#/' {}
    xargs -0 -I {} sh -c '
        sed -i "s/^#[[:space:]]\+/#/" "$1"
        sed -i "s/^#\(define\|undef\|ifdef\|ifndef\|endif\|if\|else\|elif\|include\)[[:space:]]\+/#\1 /" "$1"
    ' _ {}

# Add .clang-format file to lib_lc3plus to disable formatting there
printf "Disabling clang-format in lib_lc3plus directory\n"
+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ if [ $ISAR -eq 1 ]; then
        echo "
        #define ENABLE_HR_MODE
        //#define DYNMEM_COUNT
        #define CR10_A_ATTENUATION_CURVE_SELECTOR
        //#define USE_LC3_OPERATORS
        #define SUBSET_NB
        #define SUBSET_WB
        #define SUBSET_SSWB
+2 −2

File changed.

Contains only whitespace changes.

+2 −2

File changed.

Contains only whitespace changes.

+12 −12

File changed.

Contains only whitespace changes.

+2 −2

File changed.

Contains only whitespace changes.

+15 −15

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+10 −10

File changed.

Contains only whitespace changes.

Loading