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

Merge pull request #414 from mstorsjo/unix-newlines

Browse Source 
Convert encoder config files to unix newlines
This commit is contained in:
Ethan Hugg 2014-03-05 07:08:48 -08:00
commit 4b97d2d48f
2 changed files with 134 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
testbin/welsenc.cfg
View File

@ -1,67 +1,67 @@
# Cisco Scalable H.264/AVC Extension Encoder Configuration File # Cisco Scalable H.264/AVC Extension Encoder Configuration File
#============================== GENERAL ============================== #============================== GENERAL ==============================
SourceWidth 320 #input video width SourceWidth 320 #input video width
SourceHeight 192 #input video height SourceHeight 192 #input video height
InputFile ../res/CiscoVT2people_320x192_12fps.yuv # Input file InputFile ../res/CiscoVT2people_320x192_12fps.yuv # Input file
OutputFile test.264 # Bitstream file OutputFile test.264 # Bitstream file
MaxFrameRate 30 # Maximum frame rate [Hz] MaxFrameRate 30 # Maximum frame rate [Hz]
FramesToBeEncoded -1 # Number of frames (at input frame rate) FramesToBeEncoded -1 # Number of frames (at input frame rate)
TemporalLayerNum 3 # temporal layer number(1--4) TemporalLayerNum 3 # temporal layer number(1--4)
IntraPeriod 0 # Intra Period ( multipler of GoP size or -1) IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
EnableSpsPpsIDAddition 1 EnableSpsPpsIDAddition 1
EnableFrameCropping 1 # enable frame cropping flag EnableFrameCropping 1 # enable frame cropping flag
#============================== LOOP FILTER ============================== #============================== LOOP FILTER ==============================
LoopFilterDisableIDC 0 # Loop filter idc (0: on, 1: off, LoopFilterDisableIDC 0 # Loop filter idc (0: on, 1: off,
# 2: on except for slice boundaries, # 2: on except for slice boundaries,
# 3: two stage. slice boundries on in second stage # 3: two stage. slice boundries on in second stage
# 4: Luma on but Chroma off (w.r.t. idc=0) # 4: Luma on but Chroma off (w.r.t. idc=0)
# 5: Luma on except on slice boundaries, but Chroma off in enh. layer (w.r.t. idc=2) # 5: Luma on except on slice boundaries, but Chroma off in enh. layer (w.r.t. idc=2)
# 6: Luma on in two stage. slice boundries on in second stage, but Chroma off (w.r.t. idc=3) # 6: Luma on in two stage. slice boundries on in second stage, but Chroma off (w.r.t. idc=3)
LoopFilterAlphaC0Offset 0 # AlphaOffset(-6..+6): valid range LoopFilterAlphaC0Offset 0 # AlphaOffset(-6..+6): valid range
LoopFilterBetaOffset 0 # BetaOffset (-6..+6): valid range LoopFilterBetaOffset 0 # BetaOffset (-6..+6): valid range
InterLayerLoopFilterDisableIDC 0 # filter idc for inter-layer deblocking (0: on, 1: off, InterLayerLoopFilterDisableIDC 0 # filter idc for inter-layer deblocking (0: on, 1: off,
# 2: on except for slice boundaries, # 2: on except for slice boundaries,
# 3: two stage. slice boundries on in second stage # 3: two stage. slice boundries on in second stage
# 4: Luma on but Chroma off in enh. layer (w.r.t. idc=0) # 4: Luma on but Chroma off in enh. layer (w.r.t. idc=0)
# 5: Luma on except on slice boundaries, but Chroma off in enh. layer (w.r.t. idc=2) # 5: Luma on except on slice boundaries, but Chroma off in enh. layer (w.r.t. idc=2)
# 6: Luma on in two stage. slice boundries on in second stage, but Chroma off (w.r.t. idc=3) # 6: Luma on in two stage. slice boundries on in second stage, but Chroma off (w.r.t. idc=3)
InterLayerLoopFilterAlphaC0Offset 0 # AlphaOffset for inter-layer deblocking InterLayerLoopFilterAlphaC0Offset 0 # AlphaOffset for inter-layer deblocking
InterLayerLoopFilterBetaOffset 0 # BetaOffset for inter-layer deblocking InterLayerLoopFilterBetaOffset 0 # BetaOffset for inter-layer deblocking
#============================== SOFTWARE IMPLEMENTATION ============================== #============================== SOFTWARE IMPLEMENTATION ==============================
MultipleThreadIdc 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads; MultipleThreadIdc 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
#============================== RATE CONTROL ============================== #============================== RATE CONTROL ==============================
EnableRC 1 # ENABLE RC EnableRC 1 # ENABLE RC
TargetBitrate 5000 # Unit: kbps, controled by EnableRC also TargetBitrate 5000 # Unit: kbps, controled by EnableRC also
EnableFrameSkip 1 #Enable Frame Skip EnableFrameSkip 1 #Enable Frame Skip
#============================== DENOISE CONTROL ============================== #============================== DENOISE CONTROL ==============================
EnableDenoise 0 # Enable Denoise (1: enable, 0: disable) EnableDenoise 0 # Enable Denoise (1: enable, 0: disable)
#============================== SCENE CHANGE DETECTION CONTROL ======================= #============================== SCENE CHANGE DETECTION CONTROL =======================
EnableSceneChangeDetection 1 # Enable Scene Change Detection (1: enable, 0: disable) EnableSceneChangeDetection 1 # Enable Scene Change Detection (1: enable, 0: disable)
#============================== BACKGROUND DETECTION CONTROL ============================== #============================== BACKGROUND DETECTION CONTROL ==============================
EnableBackgroundDetection 1 # BGD control(1: enable, 0: disable) EnableBackgroundDetection 1 # BGD control(1: enable, 0: disable)
#============================== ADAPTIVE QUANTIZATION CONTROL ======================= #============================== ADAPTIVE QUANTIZATION CONTROL =======================
EnableAdaptiveQuantization 1 # Enable Adaptive Quantization (1: enable, 0: disable) EnableAdaptiveQuantization 1 # Enable Adaptive Quantization (1: enable, 0: disable)
#============================== LONG TERM REFERENCE CONTROL ============================== #============================== LONG TERM REFERENCE CONTROL ==============================
EnableLongTermReference 0 # Enable Long Term Reference (1: enable, 0: disable) EnableLongTermReference 0 # Enable Long Term Reference (1: enable, 0: disable)
LtrMarkPeriod 30 # Long Term Reference Marking Period LtrMarkPeriod 30 # Long Term Reference Marking Period
#============================== LAYER DEFINITION ============================== #============================== LAYER DEFINITION ==============================
PrefixNALAddingCtrl 0 # Control flag of adding prefix unit (0: off, 1: on) PrefixNALAddingCtrl 0 # Control flag of adding prefix unit (0: off, 1: on)
# It shall always be on in SVC contexts (i.e. when there are CGS/MGS/spatial enhancement layers) # It shall always be on in SVC contexts (i.e. when there are CGS/MGS/spatial enhancement layers)
# Can be disabled when no inter spatial layer prediction in case of its value as 0 # Can be disabled when no inter spatial layer prediction in case of its value as 0
NumLayers 1 # Number of layers NumLayers 1 # Number of layers
//LayerCfg layer0.cfg # Layer 0 configuration file //LayerCfg layer0.cfg # Layer 0 configuration file
//LayerCfg layer1.cfg # Layer 1 configuration file //LayerCfg layer1.cfg # Layer 1 configuration file
LayerCfg layer2.cfg # Layer 2 configuration file LayerCfg layer2.cfg # Layer 2 configuration file

134
testbin/welsenc_ios.cfg
View File

@ -1,67 +1,67 @@
# Cisco Scalable H.264/AVC Extension Encoder Configuration File # Cisco Scalable H.264/AVC Extension Encoder Configuration File
#============================== GENERAL ============================== #============================== GENERAL ==============================
SourceWidth 320 #input video width SourceWidth 320 #input video width
SourceHeight 192 #input video height SourceHeight 192 #input video height
InputFile ../res/CiscoVT2people_320x192_12fps.yuv # Input file InputFile ../res/CiscoVT2people_320x192_12fps.yuv # Input file
OutputFile test.264 # Bitstream file OutputFile test.264 # Bitstream file
MaxFrameRate 30 # Maximum frame rate [Hz] MaxFrameRate 30 # Maximum frame rate [Hz]
FramesToBeEncoded -1 # Number of frames (at input frame rate) FramesToBeEncoded -1 # Number of frames (at input frame rate)
TemporalLayerNum 3 # temporal layer number(1--4) TemporalLayerNum 3 # temporal layer number(1--4)
IntraPeriod 0 # Intra Period ( multipler of GoP size or -1) IntraPeriod 0 # Intra Period ( multipler of GoP size or -1)
EnableSpsPpsIDAddition 1 EnableSpsPpsIDAddition 1
EnableFrameCropping 1 # enable frame cropping flag EnableFrameCropping 1 # enable frame cropping flag
#============================== LOOP FILTER ============================== #============================== LOOP FILTER ==============================
LoopFilterDisableIDC 0 # Loop filter idc (0: on, 1: off, LoopFilterDisableIDC 0 # Loop filter idc (0: on, 1: off,
# 2: on except for slice boundaries, # 2: on except for slice boundaries,
# 3: two stage. slice boundries on in second stage # 3: two stage. slice boundries on in second stage
# 4: Luma on but Chroma off (w.r.t. idc=0) # 4: Luma on but Chroma off (w.r.t. idc=0)
# 5: Luma on except on slice boundaries, but Chroma off in enh. layer (w.r.t. idc=2) # 5: Luma on except on slice boundaries, but Chroma off in enh. layer (w.r.t. idc=2)
# 6: Luma on in two stage. slice boundries on in second stage, but Chroma off (w.r.t. idc=3) # 6: Luma on in two stage. slice boundries on in second stage, but Chroma off (w.r.t. idc=3)
LoopFilterAlphaC0Offset 0 # AlphaOffset(-6..+6): valid range LoopFilterAlphaC0Offset 0 # AlphaOffset(-6..+6): valid range
LoopFilterBetaOffset 0 # BetaOffset (-6..+6): valid range LoopFilterBetaOffset 0 # BetaOffset (-6..+6): valid range
InterLayerLoopFilterDisableIDC 0 # filter idc for inter-layer deblocking (0: on, 1: off, InterLayerLoopFilterDisableIDC 0 # filter idc for inter-layer deblocking (0: on, 1: off,
# 2: on except for slice boundaries, # 2: on except for slice boundaries,
# 3: two stage. slice boundries on in second stage # 3: two stage. slice boundries on in second stage
# 4: Luma on but Chroma off in enh. layer (w.r.t. idc=0) # 4: Luma on but Chroma off in enh. layer (w.r.t. idc=0)
# 5: Luma on except on slice boundaries, but Chroma off in enh. layer (w.r.t. idc=2) # 5: Luma on except on slice boundaries, but Chroma off in enh. layer (w.r.t. idc=2)
# 6: Luma on in two stage. slice boundries on in second stage, but Chroma off (w.r.t. idc=3) # 6: Luma on in two stage. slice boundries on in second stage, but Chroma off (w.r.t. idc=3)
InterLayerLoopFilterAlphaC0Offset 0 # AlphaOffset for inter-layer deblocking InterLayerLoopFilterAlphaC0Offset 0 # AlphaOffset for inter-layer deblocking
InterLayerLoopFilterBetaOffset 0 # BetaOffset for inter-layer deblocking InterLayerLoopFilterBetaOffset 0 # BetaOffset for inter-layer deblocking
#============================== SOFTWARE IMPLEMENTATION ============================== #============================== SOFTWARE IMPLEMENTATION ==============================
MultipleThreadIdc 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads; MultipleThreadIdc 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
#============================== RATE CONTROL ============================== #============================== RATE CONTROL ==============================
EnableRC 1 # ENABLE RC EnableRC 1 # ENABLE RC
TargetBitrate 5000 # Unit: kbps, controled by EnableRC also TargetBitrate 5000 # Unit: kbps, controled by EnableRC also
EnableFrameSkip 1 #Enable Frame Skip EnableFrameSkip 1 #Enable Frame Skip
#============================== DENOISE CONTROL ============================== #============================== DENOISE CONTROL ==============================
EnableDenoise 0 # Enable Denoise (1: enable, 0: disable) EnableDenoise 0 # Enable Denoise (1: enable, 0: disable)
#============================== SCENE CHANGE DETECTION CONTROL ======================= #============================== SCENE CHANGE DETECTION CONTROL =======================
EnableSceneChangeDetection 1 # Enable Scene Change Detection (1: enable, 0: disable) EnableSceneChangeDetection 1 # Enable Scene Change Detection (1: enable, 0: disable)
#============================== BACKGROUND DETECTION CONTROL ============================== #============================== BACKGROUND DETECTION CONTROL ==============================
EnableBackgroundDetection 1 # BGD control(1: enable, 0: disable) EnableBackgroundDetection 1 # BGD control(1: enable, 0: disable)
#============================== ADAPTIVE QUANTIZATION CONTROL ======================= #============================== ADAPTIVE QUANTIZATION CONTROL =======================
EnableAdaptiveQuantization 1 # Enable Adaptive Quantization (1: enable, 0: disable) EnableAdaptiveQuantization 1 # Enable Adaptive Quantization (1: enable, 0: disable)
#============================== LONG TERM REFERENCE CONTROL ============================== #============================== LONG TERM REFERENCE CONTROL ==============================
EnableLongTermReference 0 # Enable Long Term Reference (1: enable, 0: disable) EnableLongTermReference 0 # Enable Long Term Reference (1: enable, 0: disable)
LtrMarkPeriod 30 # Long Term Reference Marking Period LtrMarkPeriod 30 # Long Term Reference Marking Period
#============================== LAYER DEFINITION ============================== #============================== LAYER DEFINITION ==============================
PrefixNALAddingCtrl 0 # Control flag of adding prefix unit (0: off, 1: on) PrefixNALAddingCtrl 0 # Control flag of adding prefix unit (0: off, 1: on)
# It shall always be on in SVC contexts (i.e. when there are CGS/MGS/spatial enhancement layers) # It shall always be on in SVC contexts (i.e. when there are CGS/MGS/spatial enhancement layers)
# Can be disabled when no inter spatial layer prediction in case of its value as 0 # Can be disabled when no inter spatial layer prediction in case of its value as 0
//NumLayers 1 # Number of layers //NumLayers 1 # Number of layers
//LayerCfg layer0.cfg # Layer 0 configuration file //LayerCfg layer0.cfg # Layer 0 configuration file
//LayerCfg layer1.cfg # Layer 1 configuration file //LayerCfg layer1.cfg # Layer 1 configuration file
//LayerCfg layer2.cfg # Layer 2 configuration file //LayerCfg layer2.cfg # Layer 2 configuration file