ref: 5e956e3a1b1524c617f7c316dd7d535bb984a2bd
parent: 14acd1e663d4a087f08f1c21ecf8bc97ed973385
parent: a76005065ecc185d90eb7ea97bf7934c12065810
author: volvet <qizh@cisco.com>
date: Mon Feb 24 04:49:11 EST 2014
Merge pull request #337 from mstorsjo/update-sample-configs Update the sample configs according to the latest config syntax changes
--- 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,11 +1,14 @@
# 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)
-GOPSize 4 # GOP Size (at maximum frame rate), 16
+TemporalLayerNum 3 # temporal layer number(1--4
IntraPeriod 0 # Intra Period ( multiple of GoP size or -1)
EnableSpsPpsIDAddition 1
--- a/testbin/welsenc_vd_1d.cfg
+++ b/testbin/welsenc_vd_1d.cfg
@@ -1,11 +1,14 @@
# 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)
-GOPSize 4 # GOP Size (at maximum frame rate), 16
+TemporalLayerNum 3 # temporal layer number(1--4
IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
EnableSpsPpsIDAddition 1
--- a/testbin/welsenc_vd_rc.cfg
+++ b/testbin/welsenc_vd_rc.cfg
@@ -1,11 +1,14 @@
# 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
-GOPSize 8 # GOP Size (at maximum frame rate), 16
+TemporalLayerNum 3 # temporal layer number(1--4)
IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
EnableSpsPpsIDAddition 1