Skip to content

Commit 3423036

Browse files
committed
use noderawfs for github workflow test
1 parent 509d915 commit 3423036

File tree

6 files changed

+27749
-17
lines changed

6 files changed

+27749
-17
lines changed

.github/workflows/wasm-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
- run: make gmp-bootstrap
2222
- run: make gtest-bootstrap
2323
- run: bash ./build/mktargets.sh
24-
- run: emmake make all OS=wasm ARCH= EMFS=nodefs
24+
- run: emmake make all OS=wasm ARCH= EMFS=noderawfs
2525
- run: node h264enc.js testbin/welsenc_vd_1d_wasm_nodefs.cfg
2626
- run: node h264enc.js testbin/welsenc_vd_rc_wasm_nodefs.cfg
2727
- run: node h264enc.js testbin/welsenc_arbitrary_res_wasm_nodefs.cfg
2828
- run: node h264dec.js res/test_vd_1d.264 testbin/test_vd_1d.yuv
2929
- run: node h264dec.js res/test_vd_rc.264 testbin/test_vd_rc.yuv
3030
- run: node h264dec.js res/Static.264 testbin/Static.yuv
31-
- run: ( cd test/encoder_binary_comparison ; ./run_PrepareAllTestData.sh 64 )
31+
- run: ( cd test/encoder_binary_comparison ; ./run_PrepareAllTestData.sh 64 wasm )
3232
- run: ./run_Test.sh BinaryCompareWasm BA_MW_D.264
3333
- run: ./run_Test.sh BinaryCompareWasm Adobe_PDF_sample_a_1024x768_50Frms.264
3434
- run: ./run_Test.sh BinaryCompareWasm Zhling_1280x720.264

build/platform-wasm.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ CFLAGS += -DNODEFS
1414
CXXFLAGS += -DNODEFS
1515
LDFLAGS += -lnodefs.js
1616
endif
17+
ifeq ($(EMFS), noderawfs)
18+
CFLAGS += -DNODERAWFS
19+
CXXFLAGS += -DNODERAWFS
20+
LDFLAGS += -s NODERAWFS=1
21+
endif
1722
ifeq ($(EMFS), memfs)
1823
CFLAGS += -DMEMFS
1924
CXXFLAGS += -DMEMFS

commandTest.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
node ./h264enc.js welsenc.cfg -bf TempData/BA_MW_D.264_x.yuv_codec_target.264 -org /home/test/workspace/openh264/test/encoder_binary_comparison/AllTestData/BA_MW_D.264/BA_MW_D.264_x.yuv
2+
node ./h264enc.js welsenc.cfg -bf workload/test/encoder_binary_comparison/AllTestData/BA_MW_D.264/TempData/BA_MW_D.264_x.yuv_codec_target.264 -org /home/test/workspace/openh264/test/encoder_binary_comparison/AllTestData/BA_MW_D.264/BA_MW_D.264_x.yuv

test/encoder_binary_comparison/Scripts/run_BitStreamToYUV.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ run_BitStream2YUV()
6464
return 1
6565
fi
6666
#decode bitstream
67+
echo "running decode test, printing pwd..."
68+
echo $(pwd)
6769
if [ "$TestWasm" = "0" ]
6870
then
6971
./h264dec ${BitStreamName} ${OutputYUVName} 2> ${LogFile}

test/encoder_binary_comparison/run_PrepareAllTestData.sh

Lines changed: 54 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,24 @@ runBuildCodec()
3737
cd ${MakeFileDir}
3838
if [ "${BitType}" -eq 64 ]
3939
then
40-
make clean
41-
make -B ENABLE64BIT=Yes h264dec h264enc
40+
if [ "${TestWasm}" -eq 1 ]
41+
then
42+
make clean
43+
emmake make binaries -B ENABLE64BIT=Yes OS=wasm ARCH= EMFS=noderawfs
44+
else
45+
make clean
46+
make -B ENABLE64BIT=Yes h264dec h264enc
47+
fi
4248
elif [ "${BitType}" -eq 32 ]
4349
then
44-
make clean
45-
make -B ENABLE64BIT=No h264dec h264enc
50+
if [ "${TestWasm}" -eq 1 ]
51+
then
52+
make clean
53+
emmake make binaries -B ENABLE64BIT=No OS=wasm ARCH= EMFS=noderawfs
54+
else
55+
make clean
56+
make -B ENABLE64BIT=No h264dec h264enc
57+
fi
4658
else
4759
echo "usage: runBuildCodec \64/32 #bits"
4860
exit 1
@@ -51,14 +63,20 @@ runBuildCodec()
5163
cd ${CurrentDir}
5264

5365
echo ""
54-
if [ ! -e ${MakeFileDir}/h264enc ]
66+
if [ ! -e ${MakeFileDir}/h264enc ]
5567
then
56-
echo "h264 Encoder build failed"
57-
return 1
58-
elif [ ! -e ${MakeFileDir}/h264dec ]
68+
if [! -e $${MakeFileDir}/h264enc.js ]
69+
then
70+
echo "h264 Encoder build failed"
71+
return 1
72+
fi
73+
elif [ ! -e ${MakeFileDir}/h264dec ]
5974
then
60-
echo "h264 Decoder build failed"
61-
return 1
75+
if [! -e $${MakeFileDir}/h264dec.js ]
76+
then
77+
echo "h264 Decoder build failed"
78+
return 1
79+
fi
6280
else
6381
echo "codec build succeed!"
6482
return 0
@@ -74,8 +92,18 @@ runCopyFiles()
7492
local ConfigureFileDir="../../testbin"
7593

7694
#copy codec and configure files
77-
cp -p ${MakeFileDir}/h264enc ${CodecFolder}/
78-
cp -p ${MakeFileDir}/h264dec ${CodecFolder}/
95+
if [ "${TestWasm}" -eq 1 ]
96+
then
97+
cp -p ${MakeFileDir}/h264enc.js ${CodecFolder}/
98+
cp -p ${MakeFileDir}/h264dec.js ${CodecFolder}/
99+
cp -p ${MakeFileDir}/h264enc.worker.js ${CodecFolder}/
100+
cp -p ${MakeFileDir}/h264dec.worker.js ${CodecFolder}/
101+
cp -p ${MakeFileDir}/h264enc.wasm ${CodecFolder}/
102+
cp -p ${MakeFileDir}/h264dec.wasm ${CodecFolder}/
103+
else
104+
cp -p ${MakeFileDir}/h264enc ${CodecFolder}/
105+
cp -p ${MakeFileDir}/h264dec ${CodecFolder}/
106+
fi
79107
cp -p ${ConfigureFileDir}/layer2.cfg ${CodecFolder}/layer0.cfg
80108
cp -p ${ConfigureFileDir}/layer2.cfg ${CodecFolder}/layer1.cfg
81109
cp -p ${ConfigureFileDir}/layer2.cfg ${CodecFolder}/layer2.cfg
@@ -125,13 +153,18 @@ runPrepareAllFolder()
125153
runMain()
126154
{
127155
#parameter check!
128-
if [ ! $# -eq 1 ]
156+
if [ ! $# -eq 2 ]
129157
then
130158
echo "usage: run_PrepareAllTestFolder.sh \${BitType}"
131159
exit 1
132160
fi
133161

134162
BitType=$1
163+
export TestWasm=0
164+
if [ "${WasmTest}" = "wasm" ]
165+
then
166+
let "TestWasm=1"
167+
fi
135168
AllTestDataFolder="./AllTestData"
136169
CodecFolder="./Codec"
137170
ScriptFolder="./Scripts"
@@ -150,7 +183,12 @@ runMain()
150183
mkdir FinalResult
151184

152185
echo ""
153-
echo "building codec.........."
186+
if [ "${TestWasm}" -eq 1 ]
187+
then
188+
echo "building wasm codec.........."
189+
else
190+
echo "building codec.........."
191+
fi
154192
runBuildCodec ${BitType}
155193
if [ ! $? -eq 0 ]
156194
then
@@ -170,5 +208,6 @@ runMain()
170208
}
171209

172210
BitType=$1
173-
runMain ${BitType}
211+
WasmTest=${2:-"normal"}
212+
runMain ${BitType} ${WasmTest}
174213

0 commit comments

Comments
 (0)