Commit 563b659a authored by TYAGIRIS's avatar TYAGIRIS
Browse files

remove strip split rendering code

parent e28ee71a

scripts/prepare_instrumentation.sh

+1 −7
Original line number Diff line number Diff line
@@ -39,13 +39,7 @@ function usage { 
    exit

}



if [ -z "$1" ] || [ "$1" == "sr_off" ]; then

    INCLUDE_SPLIT=0

elif [ "$1" == "sr_on" ]; then

INCLUDE_SPLIT=1

else

    usage

fi





system=`uname -s`

scripts/strip_split_rendering.py

+0 −89
Original line number Diff line number Diff line
@@ -32,92 +32,3 @@ 


import glob

import os
 


# remove other split rendering files

sr_files_rend = [

    "lib_rend\\ivas_MSPred.c",

    "lib_rend\\ivas_NoiseGen.c",

    "lib_rend\\ivas_PerceptualModel.c",

    "lib_rend\\ivas_PredDecoder.c",

    "lib_rend\\ivas_PredEncoder.c",

    "lib_rend\\ivas_RMSEnvGrouping.c",

    "lib_rend\\ivas_lc3plus_common.c",

    "lib_rend\\ivas_lc3plus_common.h",

    "lib_rend\\ivas_lc3plus_dec.c",

    "lib_rend\\ivas_lc3plus_dec.h",

    "lib_rend\\ivas_lc3plus_enc.c",

    "lib_rend\\ivas_lc3plus_enc.h",

    "lib_rend\\ivas_lcld_decoder.c",

    "lib_rend\\ivas_lcld_encoder.c",

    "lib_rend\\ivas_lcld_prot.h",

    "lib_rend\\ivas_lcld_rom_tables.c"

    "lib_rend\\ivas_lcld_rom_tables.h"

    "lib_rend\\ivas_splitRend_lcld_dec.c",

    "lib_rend\\ivas_splitRend_lcld_enc.c",

    "lib_rend\\ivas_splitRendererPLC.c",

    "lib_rend\\ivas_splitRendererPost.c",

    "lib_rend\\ivas_splitRendererPre.c",

    "lib_rend\\ivas_splitRenderer_utils.c",

]



sr_files_util = [

    "lib_util\\split_rend_bfi_file_reader.c",

    "lib_util\\split_rend_bfi_file_reader.h",

    "lib_util\\split_render_file_read_write.c",

    "lib_util\\split_render_file_read_write.h",

]



if __name__ == "__main__":



    wsfile = ".\Workspace_msvc\Workspace_msvc.sln"

    rendproj = ".\Workspace_msvc\lib_rend.vcxproj"

    utilproj = ".\Workspace_msvc\lib_util.vcxproj"

    lc3proj = ".\Workspace_msvc\lib_lc3plus.vcxproj"



    # Remove lc3plus project

    os.remove(lc3proj)



    # Patch Workspace_msvc.sln

    with open(wsfile, "r") as f:

        lines = f.readlines()

    with open(wsfile, "w") as f:

        skip = 0

        for line in lines:

            if "lib_lc3plus.vcxproj" in line:

                skip = 1

            else:

                if skip == 0:

                    f.write(line)

                else:

                    skip = skip - 1



    # Patch lib_rend.vcxproj

    with open(rendproj, "r") as f:

        lines = f.readlines()

    with open(rendproj, "w") as f:

        skip = 0

        for line in lines:

            if any([x in line for x in sr_files_rend]):

                skip = 1

            if "lib_lc3plus.vcxproj" in line:

                skip = 4

            if skip == 0:

                f.write(line)

            else:

                skip = skip - 1



    # Patch lib_util.vcxproj

    with open(utilproj, "r") as f:

        lines = f.readlines()

    with open(utilproj, "w") as f:

        for line in lines:

            if not any([x in line for x in sr_files_util]):

                f.write(line)



    # Remove include libraries

    for proj in glob.glob(".\Workspace_msvc\*.vcxproj"):

        with open(proj, "r") as f:

            lines = f.readlines()

        with open(proj, "w") as f:

            for line in lines:

                f.write(line.replace("..\lib_lc3plus;", ""))

scripts/strip_split_rendering.sh

+0 −58
Original line number Diff line number Diff line
@@ -31,61 +31,3 @@ 
#



OUTDIR=$1
 




# remove complete lc3plus folder

rm -R $OUTDIR/lib_lc3plus



# remove other split rendering files

declare -a sr_files_rend=(

  "lib_rend/ivas_MSPred.c"

  "lib_rend/ivas_NoiseGen.c"

  "lib_rend/ivas_PerceptualModel.c"

  "lib_rend/ivas_PredDecoder.c"

  "lib_rend/ivas_PredEncoder.c"

  "lib_rend/ivas_RMSEnvGrouping.c"

  "lib_rend/ivas_lc3plus_common.c"

  "lib_rend/ivas_lc3plus_common.h"

  "lib_rend/ivas_lc3plus_dec.c"

  "lib_rend/ivas_lc3plus_dec.h"

  "lib_rend/ivas_lc3plus_enc.c"

  "lib_rend/ivas_lc3plus_enc.h"

  "lib_rend/ivas_lcld_decoder.c"

  "lib_rend/ivas_lcld_encoder.c"

  "lib_rend/ivas_lcld_prot.h"

  "lib_rend/ivas_lcld_rom_tables.c"

  "lib_rend/ivas_lcld_rom_tables.h"

  "lib_rend/ivas_splitRend_lcld_dec.c"

  "lib_rend/ivas_splitRend_lcld_enc.c"

  "lib_rend/ivas_splitRendererPLC.c"

  "lib_rend/ivas_splitRendererPost.c"

  "lib_rend/ivas_splitRendererPre.c"

  "lib_rend/ivas_splitRenderer_utils.c"

)



for file in ${sr_files_rend[@]}; do

    rm $OUTDIR/$file

    file_windows=${file//\//'\\'}

    sed -i.bak -e "/${file_windows}/d" ${OUTDIR}/Workspace_msvc/lib_rend.vcxproj

done



declare -a sr_files_util=(

  "lib_util/split_rend_bfi_file_reader.c"

  "lib_util/split_rend_bfi_file_reader.h"

  "lib_util/split_render_file_read_write.c"

  "lib_util/split_render_file_read_write.h"

)



for file in ${sr_files_util[@]}; do

    rm $OUTDIR/$file

    file_windows=${file//\//'\\'}

    sed -i.bak -e "/${file_windows}/d" ${OUTDIR}/Workspace_msvc/lib_util.vcxproj

done



# delete project file

rm ${OUTDIR}/Workspace_msvc/lib_lc3plus.vcxproj



# patch project/solution files

sed -i.bak "/lib_lc3plus.vcxproj/,+1d" ${OUTDIR}/Workspace_msvc/Workspace_msvc.sln

find ${OUTDIR}/Workspace_msvc -name "*.vcxproj" -exec sed -i.bak -e "s/..\\lib_lc3plus\;//g" \{\} \;

sed -i.bak "/lib_lc3plus.vcxproj/,+3d" ${OUTDIR}/Workspace_msvc/lib_rend.vcxproj # patch dependency