ref: d93a52ceb5e476357eb5590ea5d8a396ae2bfc9a
parent: 75f8b41bcd70c5075732a20352ebdc3bd90e2b36
author: Martin Storsjö <[email protected]>
date: Sat Feb 22 18:01:23 EST 2014
Update the other example config files to work after restructuring encoder parameters This is similar to what was done to welsenc.cfg in 3ba6a5f4daa.
--- a/testbin/layer2_arbitrary_res.cfg
+++ b/testbin/layer2_arbitrary_res.cfg
@@ -2,11 +2,10 @@
#============================== INPUT / OUTPUT ==============================
-SourceWidth 152 # Input frame width
-SourceHeight 100 # Input frame height
+FrameWidth 152 # Input frame width
+FrameHeight 100 # Input frame height
FrameRateIn 12 # Input frame rate [Hz]
FrameRateOut 12 # Output frame rate [Hz]
-InputFile ../res/Static_152_100.yuv # Input file
ReconFile rec_layer2.yuv # Reconstructed file
#============================== CODING ==============================
--- a/testbin/layer2_vd.cfg
+++ b/testbin/layer2_vd.cfg
@@ -2,11 +2,10 @@
#============================== INPUT / OUTPUT ==============================
-SourceWidth 320 # Input frame width
-SourceHeight 192 # Input frame height
+FrameWidth 320 # Input frame width
+FrameHeight 192 # Input frame height
FrameRateIn 12 # Input frame rate [Hz]
FrameRateOut 12 # Output frame rate [Hz]
-InputFile ../res/CiscoVT2people_320x192_12fps.yuv # Input file
ReconFile rec_layer2.yuv # Reconstructed file
#============================== CODING ==============================
--- a/testbin/layer2_vd_rc.cfg
+++ b/testbin/layer2_vd_rc.cfg
@@ -2,11 +2,10 @@
#============================== INPUT / OUTPUT ==============================
-SourceWidth 320 # Input frame width
-SourceHeight 192 # Input frame height
+FrameWidth 320 # Input frame width
+FrameHeight 192 # Input frame height
FrameRateIn 12 # Input frame rate [Hz]
FrameRateOut 12 # Output frame rate [Hz]
-InputFile ../res/CiscoVT2people_320x192_12fps.yuv # Input file
ReconFile rec_layer2.yuv # Reconstructed file
#============================== CODING ==============================
--- a/testbin/welsenc_arbitrary_res.cfg
+++ b/testbin/welsenc_arbitrary_res.cfg
@@ -1,6 +1,9 @@
# Cisco Scalable H.264/AVC Extension Encoder Configuration File
#============================== GENERAL ==============================
+SourceWidth 152 # Input frame width
+SourceHeight 100 # Input frame height
+InputFile ../res/Static_152_100.yuv # Input file
OutputFile Static.264 # Bitstream file
MaxFrameRate 30 # Maximum frame rate [Hz]
FramesToBeEncoded -1 # Number of frames (at input frame rate)
--- a/testbin/welsenc_vd_1d.cfg
+++ b/testbin/welsenc_vd_1d.cfg
@@ -1,6 +1,9 @@
# Cisco Scalable H.264/AVC Extension Encoder Configuration File
#============================== GENERAL ==============================
+SourceWidth 320 # Input frame width
+SourceHeight 192 # Input frame height
+InputFile ../res/CiscoVT2people_320x192_12fps.yuv # Input file
OutputFile test_vd_1d.264 # Bitstream file
MaxFrameRate 30 # Maximum frame rate [Hz]
FramesToBeEncoded -1 # Number of frames (at input frame rate)
--- a/testbin/welsenc_vd_rc.cfg
+++ b/testbin/welsenc_vd_rc.cfg
@@ -1,6 +1,9 @@
# Cisco Scalable H.264/AVC Extension Encoder Configuration File
#============================== GENERAL ==============================
+SourceWidth 320 # Input frame width
+SourceHeight 192 # Input frame height
+InputFile ../res/CiscoVT2people_320x192_12fps.yuv
OutputFile test_vd_rc.264 # Bitstream file
MaxFrameRate 30 # Maximum frame rate [Hz]
FramesToBeEncoded -1 # Number of frames (at input frame rate), -1