Author: duncan
Date: Thu Nov 15 02:38:41 2007
New Revision: 10125
Log:
Moved the configuration data to freevo_config.py
Recent versions of mencoder do not have
i_certify_that_my_video_stream_does_not_use_b_frames option
Modified:
branches/rel-1-7/freevo/freevo_config.py
branches/rel-1-7/freevo/src/encodingcore.py
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/src/encodingcore.py
Modified: branches/rel-1-7/freevo/freevo_config.py
==============================================================================
--- branches/rel-1-7/freevo/freevo_config.py (original)
+++ branches/rel-1-7/freevo/freevo_config.py Thu Nov 15 02:38:41 2007
@@ -1990,6 +1990,36 @@
ENCODINGSERVER_IP = 'localhost'
ENCODINGSERVER_PORT = 6666
+# These paramaters are passed to mencoder, beware about changing them
+ENCODINGSERVER_CONTAINER_CAP_LIST = [ 'avi', 'mkv', 'mp4' ]
+ENCODINGSERVER_VIDEO_CODEC_LIST = [ 'MPEG 4 (lavc)', 'XviD', 'H.264', 'iPodv' ]
+ENCODINGSERVER_AUDIO_CODEC_LIST = [ 'MPEG 1 Layer 3 (mp3)', 'Ogg', 'AAC',
'iPoda' ]
+
+ENCODINGSERVER_VIDEO_FILTERS = {
+ 'None' : ['None'],
+ 'Deinterlacing' : ['None', 'Linear blend', 'Lavc deinterlacer'],
+ 'Inverse Telecine' : ['None', 'On (stateless filter)'],
+ 'Denoise' : ['None', 'Normal denoise', 'HQ denoise'],
+ 'iPod' : ['iPod'],
+}
+
+ENCODINGSERVER_MENCODER_FILTERS = {
+ 'Linear blend' : 'pp=lb',
+ 'Lavc deinterlacer' : 'lavcdeint',
+ 'On (stateless filter)' : 'ivtc=1',
+ 'Normal denoise' : 'denoise3d',
+ 'HQ denoise' : 'hqdn3d',
+ 'iPod' : 'scale=320:240'
+}
+
+ENCODINGSERVER_MENCODER_MAPPING = {
+ 'MPEG 4 (lavc)' : ['copy', 'lavc', ['-lavcopts',
'vcodec=mpeg4:vhq:vqmin=2:v4mv:trell:autoaspect:vbitrate=%s%s']],
+ 'XviD' : ['copy', 'xvid', ['-xvidencopts', 'bitrate=%s%s']],
+ 'MPEG 1 Layer 3 (mp3)' : ['frameno', 'mp3lame', ['-lameopts',
'cbr:br=%s']],
+ 'iPodv' : ['lavc', 'lavc', ['-lavcopts',
'vcodec=mpeg4:vbitrate=%s%s:mbd=2:cmp=2:subcmp=2:trell=yes:v4mv=yes:vglobal=1:acodec=aac:abitrate=128:aic=2:aglobal=1'],
['-of', 'lavf'], ['-ffourcc', 'mp4v'], ['-lavfopts',
'format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames']],
+ 'iPoda' : ['lavc', 'lavc', ['-lavcopts',
'acodec=aac:abitrate=%s:aic=2:aglobal=1'], ['-lavfopts',
'format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames']]
+}
+
# ======================================================================
# Freevo builtin commdetect server settings:
# ======================================================================
Modified: branches/rel-1-7/freevo/src/encodingcore.py
==============================================================================
--- branches/rel-1-7/freevo/src/encodingcore.py (original)
+++ branches/rel-1-7/freevo/src/encodingcore.py Thu Nov 15 02:38:41 2007
@@ -49,37 +49,12 @@
__license__ = 'GPL'
-#"hardcoded capabilities" .. these might change or become dynamic in the
future, when more capabilities are supported
-#the "container format" will remain hardcoded
-
-ContainerCapList = [ 'avi', 'mkv', 'mp4' ]
-VideoCodecList = [ 'MPEG 4 (lavc)', 'XviD', 'H.264', 'iPodv' ]
-AudioCodecList = [ 'MPEG 1 Layer 3 (mp3)', 'Ogg', 'AAC', 'iPoda' ]
-
-VFDict = {
- 'None' : ['None'],
- 'Deinterlacing' : ['None', 'Linear blend', 'Lavc deinterlacer'],
- 'Inverse Telecine' : ['None', 'On (stateless filter)'],
- 'Denoise' : ['None', 'Normal denoise', 'HQ denoise'],
- 'iPod' : ['iPod'],
- }
-
-MencoderFilters = {
- 'Linear blend' : 'pp=lb',
- 'Lavc deinterlacer' : 'lavcdeint',
- 'On (stateless filter)' : 'ivtc=1',
- 'Normal denoise' : 'denoise3d',
- 'HQ denoise' : 'hqdn3d',
- 'iPod' : 'scale=320:240'
- }
-
-MencoderMapping = {
- 'MPEG 4 (lavc)' : ['copy', 'lavc', ['-lavcopts',
'vcodec=mpeg4:vhq:vqmin=2:v4mv:trell:autoaspect:vbitrate=%s%s']],
- 'XviD' : ['copy', 'xvid', ['-xvidencopts', 'bitrate=%s%s']],
- 'MPEG 1 Layer 3 (mp3)' : ['frameno', 'mp3lame', ['-lameopts',
'cbr:br=%s']],
- 'iPodv' : ['lavc', 'lavc', ['-lavcopts',
'vcodec=mpeg4:vbitrate=%s%s:mbd=2:cmp=2:subcmp=2:trell=yes:v4mv=yes:vglobal=1:acodec=aac:abitrate=128:aic=2:aglobal=1'],
['-of', 'lavf'], ['-ffourcc', 'mp4v'], ['-lavfopts',
'format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames']],
- 'iPoda' : ['lavc', 'lavc', ['-lavcopts',
'acodec=aac:abitrate=%s:aic=2:aglobal=1'], ['-lavfopts',
'format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames']]
- }
+ContainerCapList = config.ENCODINGSERVER_CONTAINER_CAP_LIST
+VideoCodecList = config.ENCODINGSERVER_VIDEO_CODEC_LIST
+AudioCodecList = config.ENCODINGSERVER_AUDIO_CODEC_LIST
+VideoFilters = config.ENCODINGSERVER_VIDEO_FILTERS
+MencoderFilters = config.ENCODINGSERVER_MENCODER_FILTERS
+MencoderMapping = config.ENCODINGSERVER_MENCODER_MAPPING
#from pytvgrab enum.py, see http://pytvgrab.sourceforge.net
@@ -204,9 +179,9 @@
def getVideoFiltersList(self):
"""Return a list of possible video filters"""
if self.ntsc:
- return VFDict
+ return VideoFilters
else:
- non_ivtcdict = VFDict.copy()
+ non_ivtcdict = VideoFilters.copy()
del non_ivtcdict['Inverse Telecine']
return non_ivtcdict
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Thu Nov 15 02:38:41 2007
@@ -1995,6 +1995,36 @@
ENCODINGSERVER_IP = 'localhost'
ENCODINGSERVER_PORT = 6666
+# These paramaters are passed to mencoder, beware about changing them
+ENCODINGSERVER_CONTAINER_CAP_LIST = [ 'avi', 'mkv', 'mp4' ]
+ENCODINGSERVER_VIDEO_CODEC_LIST = [ 'MPEG 4 (lavc)', 'XviD', 'H.264', 'iPodv' ]
+ENCODINGSERVER_AUDIO_CODEC_LIST = [ 'MPEG 1 Layer 3 (mp3)', 'Ogg', 'AAC',
'iPoda' ]
+
+ENCODINGSERVER_VIDEO_FILTERS = {
+ 'None' : ['None'],
+ 'Deinterlacing' : ['None', 'Linear blend', 'Lavc deinterlacer'],
+ 'Inverse Telecine' : ['None', 'On (stateless filter)'],
+ 'Denoise' : ['None', 'Normal denoise', 'HQ denoise'],
+ 'iPod' : ['iPod'],
+}
+
+ENCODINGSERVER_MENCODER_FILTERS = {
+ 'Linear blend' : 'pp=lb',
+ 'Lavc deinterlacer' : 'lavcdeint',
+ 'On (stateless filter)' : 'ivtc=1',
+ 'Normal denoise' : 'denoise3d',
+ 'HQ denoise' : 'hqdn3d',
+ 'iPod' : 'scale=320:240'
+}
+
+ENCODINGSERVER_MENCODER_MAPPING = {
+ 'MPEG 4 (lavc)' : ['copy', 'lavc', ['-lavcopts',
'vcodec=mpeg4:vhq:vqmin=2:v4mv:trell:autoaspect:vbitrate=%s%s']],
+ 'XviD' : ['copy', 'xvid', ['-xvidencopts', 'bitrate=%s%s']],
+ 'MPEG 1 Layer 3 (mp3)' : ['frameno', 'mp3lame', ['-lameopts',
'cbr:br=%s']],
+ 'iPodv' : ['lavc', 'lavc', ['-lavcopts',
'vcodec=mpeg4:vbitrate=%s%s:mbd=2:cmp=2:subcmp=2:trell=yes:v4mv=yes:vglobal=1:acodec=aac:abitrate=128:aic=2:aglobal=1'],
['-of', 'lavf'], ['-ffourcc', 'mp4v'], ['-lavfopts',
'format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames']],
+ 'iPoda' : ['lavc', 'lavc', ['-lavcopts',
'acodec=aac:abitrate=%s:aic=2:aglobal=1'], ['-lavfopts',
'format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames']]
+}
+
# ======================================================================
# Freevo builtin commdetect server settings:
# ======================================================================
Modified: branches/rel-1/freevo/src/encodingcore.py
==============================================================================
--- branches/rel-1/freevo/src/encodingcore.py (original)
+++ branches/rel-1/freevo/src/encodingcore.py Thu Nov 15 02:38:41 2007
@@ -49,37 +49,12 @@
__license__ = 'GPL'
-#"hardcoded capabilities" .. these might change or become dynamic in the
future, when more capabilities are supported
-#the "container format" will remain hardcoded
-
-ContainerCapList = [ 'avi', 'mkv', 'mp4' ]
-VideoCodecList = [ 'MPEG 4 (lavc)', 'XviD', 'H.264', 'iPodv' ]
-AudioCodecList = [ 'MPEG 1 Layer 3 (mp3)', 'Ogg', 'AAC', 'iPoda' ]
-
-VFDict = {
- 'None' : ['None'],
- 'Deinterlacing' : ['None', 'Linear blend', 'Lavc deinterlacer'],
- 'Inverse Telecine' : ['None', 'On (stateless filter)'],
- 'Denoise' : ['None', 'Normal denoise', 'HQ denoise'],
- 'iPod' : ['iPod'],
- }
-
-MencoderFilters = {
- 'Linear blend' : 'pp=lb',
- 'Lavc deinterlacer' : 'lavcdeint',
- 'On (stateless filter)' : 'ivtc=1',
- 'Normal denoise' : 'denoise3d',
- 'HQ denoise' : 'hqdn3d',
- 'iPod' : 'scale=320:240'
- }
-
-MencoderMapping = {
- 'MPEG 4 (lavc)' : ['copy', 'lavc', ['-lavcopts',
'vcodec=mpeg4:vhq:vqmin=2:v4mv:trell:autoaspect:vbitrate=%s%s']],
- 'XviD' : ['copy', 'xvid', ['-xvidencopts', 'bitrate=%s%s']],
- 'MPEG 1 Layer 3 (mp3)' : ['frameno', 'mp3lame', ['-lameopts',
'cbr:br=%s']],
- 'iPodv' : ['lavc', 'lavc', ['-lavcopts',
'vcodec=mpeg4:vbitrate=%s%s:mbd=2:cmp=2:subcmp=2:trell=yes:v4mv=yes:vglobal=1:acodec=aac:abitrate=128:aic=2:aglobal=1'],
['-of', 'lavf'], ['-ffourcc', 'mp4v'], ['-lavfopts',
'format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames']],
- 'iPoda' : ['lavc', 'lavc', ['-lavcopts',
'acodec=aac:abitrate=%s:aic=2:aglobal=1'], ['-lavfopts',
'format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames']]
- }
+ContainerCapList = config.ENCODINGSERVER_CONTAINER_CAP_LIST
+VideoCodecList = config.ENCODINGSERVER_VIDEO_CODEC_LIST
+AudioCodecList = config.ENCODINGSERVER_AUDIO_CODEC_LIST
+VideoFilters = config.ENCODINGSERVER_VIDEO_FILTERS
+MencoderFilters = config.ENCODINGSERVER_MENCODER_FILTERS
+MencoderMapping = config.ENCODINGSERVER_MENCODER_MAPPING
#from pytvgrab enum.py, see http://pytvgrab.sourceforge.net
@@ -204,9 +179,9 @@
def getVideoFiltersList(self):
"""Return a list of possible video filters"""
if self.ntsc:
- return VFDict
+ return VideoFilters
else:
- non_ivtcdict = VFDict.copy()
+ non_ivtcdict = VideoFilters.copy()
del non_ivtcdict['Inverse Telecine']
return non_ivtcdict
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
