generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #139 from varunbpatil/enc_arb_res

Browse Source 
Updated issues in README, Keep single copy of YUV test streams, enc/dec tests for arbitrary res stream
This commit is contained in:
Ethan Hugg 2014-01-13 08:29:28 -08:00
commit 3ba067a4c8
15 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -28,3 +28,5 @@ testbin/test_vd_1d.264
testbin/test_vd_1d.yuv
testbin/test_vd_rc.264
testbin/test_vd_rc.yuv
testbin/test.264
testbin/test.yuv

1
README.md
View File

@ -91,7 +91,6 @@ Known Issues
See the issue tracker on https://github.com/cisco/openh264/issues
- Encoder errors when resolution exceeds 3840x2160
- Encoder errors when compressed frame size exceeds half uncompressed size
- Encoder console app only support multiple of 16 width/height for now
- Decoder errors when compressed frame size exceeds 1MB
License

BIN
res/Static.264 Normal file
View File

Binary file not shown.

0
testbin/Static_152_100.yuv → res/Static_152_100.yuv
View File

3
test/decoder_test.cpp
View File

@ -187,7 +187,8 @@ TEST_P(DecoderOutputTest, CompareOutput) {
static const FileParam kFileParamArray[] = {
{"res/test_vd_1d.264", "5827d2338b79ff82cd091c707823e466197281d3"},
{"res/test_vd_rc.264", "eea02e97bfec89d0418593a8abaaf55d02eaa1ca"}
{"res/test_vd_rc.264", "eea02e97bfec89d0418593a8abaaf55d02eaa1ca"},
{"res/Static.264", "91dd4a7a796805b2cd015cae8fd630d96c663f42"}
};
INSTANTIATE_TEST_CASE_P(DecodeFile, DecoderOutputTest,

4
test/encoder_test.cpp
View File

@ -144,6 +144,10 @@ static const EncodeFileParam kFileParamArray[] = {
"res/CiscoVT2people_160x96_6fps.yuv",
"6eb53b6bfdb95dfca0575bd3efe81aa58163951c", 160, 96, 6.0f
},
{
"res/Static_152_100.yuv",
"c5af55647a5ead570bd5d96651e05ea699762b8e", 152, 100, 6.0f
},
};
INSTANTIATE_TEST_CASE_P(EncodeFile, EncoderOutputTest,

1
testbin/CiscoVT2people_160x96_6fps.yuv
View File

File diff suppressed because one or more lines are too long

1
testbin/CiscoVT2people_320x192_12fps.yuv
View File

File diff suppressed because one or more lines are too long

6
testbin/CmdLineExample.sh
View File

@ -1,5 +1,7 @@
../h264enc welsenc_vd_1d.cfg
../h264enc welsenc_vd_rc.cfg
../h264enc welsenc_arbitrary_res.cfg
../h264dec test_vd_1d.264 test_vd_1d.yuv
../h264dec test_vd_rc.264 test_vd_rc.yuv
../h264dec ../res/test_vd_1d.264 test_vd_1d.yuv
../h264dec ../res/test_vd_rc.264 test_vd_rc.yuv
../h264dec ../res/Static.264 Static.yuv

8
testbin/CmdLineReadMe
View File

@ -2,6 +2,7 @@
//for encoder configure files
welsenc_vd_1d.cfg
welsenc_vd_rc.cfg
welsenc_arbitrary_res.cfg
//the actual generated decoder EXE files are in folder ../bin/win32/release/ with Release build
//user may copy "decConsole.exe" and "welsdec.dll" into ../bin
@ -10,11 +11,12 @@ welsenc_vd_rc.cfg
Example Command Line for encoding in Windows:
../bin/encConsole.exe welsenc_vd_1d.cfg
../bin/encConsole.exe welsenc_vd_rc.cfg
../bin/encConsole.exe welsenc_arbitrary_res.cfg
Example Command Line for decoding in Windows
../bin/decConsole.exe welsenc_vd_1d.264 welsenc_vd_1d.yuv
../bin/decConsole.exe welsenc_vd_rc.264 welsenc_vd_rc.yuv
../bin/decConsole.exe ../res/test_vd_1d.264 test_vd_1d.yuv
../bin/decConsole.exe ../res/test_vd_rc.264 test_vd_rc.yuv
../bin/decConsole.exe ../res/Static.264 Static.yuv
Example shell script for Linux for encoder & decoder:
CmdLineExample.sh

2
testbin/layer2.cfg
View File

@ -6,7 +6,7 @@ SourceWidth 320 # Input frame width
SourceHeight 192 # Input frame height
FrameRateIn 12 # Input frame rate [Hz]
FrameRateOut 12 # Output frame rate [Hz]
InputFile CiscoVT2people_320x192_12fps.yuv # Input file
InputFile ../res/CiscoVT2people_320x192_12fps.yuv # Input file
ReconFile rec_layer2.yuv # Reconstructed file
#============================== CODING ==============================

2
testbin/layer2_arbitrary_res.cfg
View File

@ -6,7 +6,7 @@ SourceWidth 152 # Input frame width
SourceHeight 100 # Input frame height
FrameRateIn 12 # Input frame rate [Hz]
FrameRateOut 12 # Output frame rate [Hz]
InputFile Static_152_100.yuv # Input file
InputFile ../res/Static_152_100.yuv # Input file
ReconFile rec_layer2.yuv # Reconstructed file
#============================== CODING ==============================

2
testbin/layer2_vd.cfg
View File

@ -6,7 +6,7 @@ SourceWidth 320 # Input frame width
SourceHeight 192 # Input frame height
FrameRateIn 12 # Input frame rate [Hz]
FrameRateOut 12 # Output frame rate [Hz]
InputFile CiscoVT2people_320x192_12fps.yuv # Input file
InputFile ../res/CiscoVT2people_320x192_12fps.yuv # Input file
ReconFile rec_layer2.yuv # Reconstructed file
#============================== CODING ==============================

2
testbin/layer2_vd_rc.cfg
View File

@ -6,7 +6,7 @@ SourceWidth 320 # Input frame width
SourceHeight 192 # Input frame height
FrameRateIn 12 # Input frame rate [Hz]
FrameRateOut 12 # Output frame rate [Hz]
InputFile CiscoVT2people_320x192_12fps.yuv # Input file
InputFile ../res/CiscoVT2people_320x192_12fps.yuv # Input file
ReconFile rec_layer2.yuv # Reconstructed file
#============================== CODING ==============================

2
testbin/welsenc_arbitrary_res.cfg
View File

@ -1,7 +1,7 @@
# Cisco Scalable H.264/AVC Extension Encoder Configuration File
#============================== GENERAL ==============================
OutputFile test.264 # Bitstream file
OutputFile Static.264 # Bitstream file
MaxFrameRate 30 # Maximum frame rate [Hz]
FramesToBeEncoded -1 # Number of frames (at input frame rate)