Commit 781a6ef4 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'isar_selection_branch' of... 

Merge branch 'isar_selection_branch' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into isar_selection_branch
parents 312f0822 42a685f3

lib_lc3plus/mdct.c

+4 −1
Original line number Diff line number Diff line
@@ -150,4 +150,7 @@ void mdct_apply(const LC3_FLOAT* input, LC3_FLOAT* output, Mdct* mdct) 
    dct4_apply(&mdct->dct, tmp, output);

}



void processMdct_fl(LC3_FLOAT* in, LC3_FLOAT* out, Mdct* mdctStruct) { mdct_apply(in, out, mdctStruct); }
 
void processMdct_fl(LC3_FLOAT* in, LC3_FLOAT* out, Mdct* mdctStruct)

{

    mdct_apply(in, out, mdctStruct);

}

scripts/lc3plus_lib_setup/get_lc3plus.sh

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ unzip lc3plus_sources.zip -d . 


# Modify LC3plus code to be compatible with IVAS tools (e.g. WMC tool)

git apply --ignore-whitespace lc3plus.patch

sed -i 's/ \({\) \(mdct_apply(.*);\) /\n\1\n    \2\n/' ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/mdct.c

rm ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft.c

rm ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/codec_exe.c

scripts/prepare_instrumentation.sh

+21 −0
Original line number Diff line number Diff line
@@ -87,6 +87,25 @@ fi 
rm -f $ifdef_list

touch $ifdef_list



# Add LC3plus feature defines to options.h so that they are stripped correctly

if [ $INCLUDE_SPLIT -eq 1 ]; then

    # Generate list of active defines in LC3plus defines.h

    lc3plus_defines=$(

        gcc -E -dM $targetdir/lib_lc3plus/defines.h -I $targetdir/lib_com |

            sed '/^#define [[:alnum:]][[:alnum:]_]\+[[:space:]]*$/! d' |

            sed '/#define DEFINES_H/ d'

    )



    # Append LC3plus defines to options.h

    echo "

/* LC3plus switches */

#ifndef OPTIONS_H_LC3_DEFINES

#define OPTIONS_H_LC3_DEFINES

$lc3plus_defines

#endif /* OPTIONS_H_LC3_DEFINES */

" >>$targetdir/lib_com/options.h

fi



# get switches from options.h and append it to $ifdef_list

parse_options_opt=""

if coan_exists; then
@@ -109,6 +128,8 @@ if coan_exists; then 


    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_{com,dec,enc,isar,rend,util,debug}/!(wmc_auto*).[hc]

    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/apps/*.[hc]

    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_lc3plus/!(wmc_auto*).[hc]

    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_lc3plus/fft/!(wmc_auto*).[hc]

else

    ./strip_defines_cppp.sh $targetdir $ifdef_list

fi