Author: duncan
Date: Mon Dec 18 06:47:01 2006
New Revision: 8736
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/local_conf.py.example
branches/rel-1/freevo/src/tv/plugins/mplayer.py
branches/rel-1/freevo/src/video/plugins/mplayer.py
Log:
Removed MPLAYER_VO_DEV_HWACCEL settings, added MPLAYER_AUTOCROP_START, fixed
mplayer autocrop
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Mon Dec 18 06:47:01 2006
@@ -28,7 +28,6 @@
* New RSS server, for getting podcasts, etc. (F#1580407)
* New XM online plugin (F#1580412)
* New webserver library, allows playing/viewing on local and host machines
(F#1592806)
- * Updated autocrop to take more samples from different parts of the video
(F#1591170)
* Updated cdbackup plug-in to accept CD_RIP_CASE and CD_RIP_REPLACE_SPACE
(F#1616046)
* Updated idlebar clock plug-in to allow CLOCK_FORMAT to be used (F#1605951)
* Updated idlebar diskfree plug-in to allow the bar colours levels to be set
(F#1605953)
@@ -38,6 +37,7 @@
* Updated multimail plug-in for Maildir support (F#1594915)
* Updated recordserver to allow automatic deleting of old recordings when low
on disk space (F#1594630)
* Updated tv mplayer plug-in to pause live tv and change channels without
stopping for dvb (F#1610656)
+ * Removed video plug-in mplayer for unichrome playback (B#1606699)
== Release 1.6.2 (2006-12-22) ==
--------------------------------
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Mon Dec 18 06:47:01 2006
@@ -250,7 +250,6 @@
Added ENCODINGSERVER_UID and ENCODINGSERVER_GID
Added optional ENCODINGSERVER_DEBUG, if not defined uses DEBUG
Added RSSSERVER_UID and RSSSERVER_GID
- Added MPLAYER_VO_DEV_HWACCEL and MPLAYER_VO_DEV_OPTS_HWACCEL
Added plug-in: Apple trailers in the contrib area
Added plug-in: reencode and idlebar encode to compress mpeg video
Added plug-in: XM online
@@ -1319,8 +1318,6 @@
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 = ''
DVD_LANG_PREF = 'en,se,no' # Order of preferred languages on DVD.
DVD_SUBTITLE_PREF = '' # Order of preferred subtitles on DVD.
@@ -1379,6 +1376,7 @@
# bars on a 16:9 tv
#
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/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1/freevo/local_conf.py.example (original)
+++ branches/rel-1/freevo/local_conf.py.example Mon Dec 18 06:47:01 2006
@@ -842,9 +842,7 @@
# MPLAYER_AO_DEV = 'oss:/dev/dsp' # e.g.: oss,sdl,alsa, 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.: ':some_var=vcal'
# DVD_LANG_PREF = 'en,se,no' # Order of preferred languages on DVD.
# DVD_SUBTITLE_PREF = '' # Order of preferred subtitles on DVD.
Modified: branches/rel-1/freevo/src/tv/plugins/mplayer.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/mplayer.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/mplayer.py Mon Dec 18 06:47:01 2006
@@ -94,7 +94,6 @@
# Build the MPlayer command
args = (config.MPLAYER_NICE, config.MPLAYER_CMD, config.MPLAYER_VO_DEV,
- config.MPLAYER_VO_DEV_HWACCEL,
config.MPLAYER_VO_DEV_OPTS_HWACCEL,
config.MPLAYER_VO_DEV_OPTS, config.MPLAYER_AO_DEV,
config.MPLAYER_ARGS_DEF)
if mode == 'tv':
@@ -162,7 +161,7 @@
args += (tvcmd,)
- mpl = '--prio=%s %s -vo %s%s %s %s -ao %s -fs %s -slave %s %s' % args
+ mpl = '--prio=%s %s -vo %s %s -ao %s -fs %s -slave %s %s' % args
command = mpl
_debug_('command=\"%s\"', (command))
Modified: branches/rel-1/freevo/src/video/plugins/mplayer.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/mplayer.py (original)
+++ branches/rel-1/freevo/src/video/plugins/mplayer.py Mon Dec 18 06:47:01 2006
@@ -53,8 +53,6 @@
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)
@@ -117,9 +115,6 @@
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:]
@@ -157,10 +152,6 @@
additional_args = []
if mode == 'dvd':
- if config.MPLAYER_VO_DEV_HWACCEL:
- 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
@@ -249,8 +240,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
