Author: duncan
Date: Mon Dec 18 07:53:33 2006
New Revision: 8737
Modified:
branches/rel-1-6/freevo/ChangeLog
branches/rel-1-6/freevo/freevo_config.py
branches/rel-1-6/freevo/local_conf.py.example
branches/rel-1-6/freevo/src/video/plugins/mplayer.py
Log:
[ 1606699 ] unichrome mpeg playback
Patch reversed, not needed as it can be done with MPLAYER_VO_DEV='xvmc,xvidix'
and with 'vob','mpeg' and 'mpg' defined in MPLAYER_ARGS
Modified: branches/rel-1-6/freevo/ChangeLog
==============================================================================
--- branches/rel-1-6/freevo/ChangeLog (original)
+++ branches/rel-1-6/freevo/ChangeLog Mon Dec 18 07:53:33 2006
@@ -20,7 +20,6 @@
* Updated autoshutdown to react to the return code and removed unused vars
(B#1612257)
* Updated osd forced fonts variables and freevo_config and local_conf
(B#1608393)
* Updated Spanish translation (B#1612612)
- * Updated video plug-in mplayer for unichrome playback (B#1606699)
== Release 1.6.1 (2006-11-25) ==
--------------------------------
Modified: branches/rel-1-6/freevo/freevo_config.py
==============================================================================
--- branches/rel-1-6/freevo/freevo_config.py (original)
+++ branches/rel-1-6/freevo/freevo_config.py Mon Dec 18 07:53:33 2006
@@ -1265,9 +1265,7 @@
else:
MPLAYER_VO_DEV = CONF.display # e.g.: x11,mga,fbdev, see mplayer docs
-MPLAYER_VO_DEV_OPTS = '' # e.g.: ':some_var=vcal'
-MPLAYER_VO_DEV_HWACCEL = '' # Mainly used for Via EPIA video
-MPLAYER_VO_DEV_OPTS_HWACCEL = ''
+MPLAYER_VO_DEV_OPTS = '' # e.g.: '-delay 0.1'
DVD_LANG_PREF = 'en,se,no' # Order of preferred languages on DVD.
DVD_SUBTITLE_PREF = '' # Order of preferred subtitles on DVD.
@@ -1323,9 +1321,11 @@
#
# Autocrop files when playing. This is useful for files in 4:3 with black
-# bars on a 16:9 tv
+# bars on a 16:9 tv, MPLAYER_AUTOCROP_START is the seconds of the first sample
+# If used for tv recordings then TV_RECORD_PADDING + 120 is a good value
#
MPLAYER_AUTOCROP = 0
+MPLAYER_AUTOCROP_START = 60
#
# Try to set correct 'delay' and 'mc' values for mplayer based on the delay
Modified: branches/rel-1-6/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1-6/freevo/local_conf.py.example (original)
+++ branches/rel-1-6/freevo/local_conf.py.example Mon Dec 18 07:53:33 2006
@@ -853,7 +853,6 @@
# 'default': '-cache 5000'
# }
-#
# Number of seconds before seek value times out. This is used when
# seeking a specified number of minutes into a movie. If you make
# a mistake or change your mind, the seek value will timeout after
@@ -861,13 +860,13 @@
#
# MPLAYER_SEEK_TIMEOUT = 8
-#
# Autocrop files when playing. This is useful for files in 4:3 with black
-# bars on a 16:9 tv
+# bars on a 16:9 tv, MPLAYER_AUTOCROP_START is the seconds of the first sample
+# If used for tv recordings then TV_RECORD_PADDING + 120 is a good value
#
# MPLAYER_AUTOCROP = 0
+# MPLAYER_AUTOCROP_START = 60
-#
# Try to set correct 'delay' and 'mc' values for mplayer based on the delay
# from mmpython.
#
@@ -877,7 +876,6 @@
#
# MPLAYER_SET_AUDIO_DELAY = 0
-#
# Mplayer video filter for interlaced or progressive videos. If you have
# a slow pc, do not use post processing
# MPLAYER_VF_INTERLACED = ''
@@ -1033,7 +1031,6 @@
# TV_RECORDFILE_MASK = '%%m-%%d %%H:%%M %(progname)s - %(title)s'
-
# if using the persitant recordserver
# TV_RECORD_SCHEDULE = '%s/record_schedule.xml' % FREEVO_CACHEDIR
@@ -1045,6 +1042,8 @@
# This must be a value in seconds although at the moment only has
# the percision of one minute.
# TV_RECORD_PADDING = 0 * 60
+# TV_RECORD_PADDING_PRE = 0 * 60
+# TV_RECORD_PADDING_POST = 0 * 60
# VCR_AUDIO = (':adevice=%s' % AUDIO_DEVICE +
# ':audiorate=32000' + # 44100 for better sound
Modified: branches/rel-1-6/freevo/src/video/plugins/mplayer.py
==============================================================================
--- branches/rel-1-6/freevo/src/video/plugins/mplayer.py (original)
+++ branches/rel-1-6/freevo/src/video/plugins/mplayer.py Mon Dec 18
07:53:33 2006
@@ -53,8 +53,7 @@
def __init__(self):
# create plugin structure
plugin.Plugin.__init__(self)
- if not hasattr(config,'MPLAYER_HWACCEL_SUFFIX'):
- config.MPLAYER_HWACCEL_SUFFIX=[]
+
# register mplayer as the object to play video
plugin.register(MPlayer(), plugin.VIDEO_PLAYER, True)
@@ -110,13 +109,6 @@
self.item_length = -1
self.item.elapsed = 0
- #XXX PS
- VODEV=config.MPLAYER_VO_DEV
- VODEVOPTS=config.MPLAYER_VO_DEV_OPTS
- if item.mimetype in config.MPLAYER_HWACCEL_SUFFIX:
- VODEV=config.MPLAYER_VO_DEV_HWACCEL
- VODEVOPTS=config.MPLAYER_VO_DEV_OPTS_HWACCEL
-
if mode == 'file':
url = item.url[6:]
self.item_info = mmpython.parse(url)
@@ -153,8 +145,6 @@
additional_args = []
if mode == 'dvd':
- VODEV=config.MPLAYER_VO_DEV_HWACCEL
- VODEVOPTS=config.MPLAYER_VO_DEV_OPTS_HWACCEL
if config.DVD_LANG_PREF:
# There are some bad mastered DVDs out there. E.g. the
specials on
# the German Babylon 5 Season 2 disc claim they have more than
one
@@ -205,9 +195,8 @@
mode = 'default'
# Mplayer command and standard arguments
- command += [ '-v', '-vo',
- VODEV]
- command += VODEVOPTS.split(' ')
+ command += [ '-v', '-vo', config.MPLAYER_VO_DEV +
+ config.MPLAYER_VO_DEV_OPTS ]
# mode specific args
command += config.MPLAYER_ARGS[mode].split(' ')
@@ -244,8 +233,9 @@
if config.MPLAYER_AUTOCROP and not item.network_play and str('
').join(command).find('crop=') == -1:
_debug_('starting autocrop')
(x1, y1, x2, y2) = (1000, 1000, 0, 0)
- crop_cmd = command[1:] + ['-ao', 'null', '-vo', 'null', '-ss',
'%s' % config.TV_RECORD_PADDING_PRE * 2,
- '-frames', '20', '-vf', 'cropdetect' ]
+ crop_cmd = [config.MPLAYER_CMD, '-ao', 'null', '-vo', 'null',
'-slave', '-nolirc',
+ '-ss', '%s' % config.MPLAYER_AUTOCROP_START, '-frames', '20',
'-vf', 'cropdetect' ]
+ crop_cmd.append(url)
child = popen2.Popen3(self.sort_filter(crop_cmd), 1, 100)
exp = re.compile('^.*-vf
crop=([0-9]*):([0-9]*):([0-9]*):([0-9]*).*')
while(1):
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
