Author: pebender
Date: Tue Dec 23 08:08:14 2008
New Revision: 4122
Modified:
trunk/gar-minimyth/html/minimyth/conf/minimyth.conf
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_VIDEO
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/video
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_VIDEO.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
trunk/gar-minimyth/script/minimyth.conf.mk
Log:
- Added MM_VIDEO_DECODER.
- Obsoleted MM_VIDEO_MPEG2_DECODER.
- Fixed a bug that would cause the MythTV 0.20.x MPEG2 decoder to be set
incorrectly.
Modified: trunk/gar-minimyth/html/minimyth/conf/minimyth.conf
==============================================================================
--- trunk/gar-minimyth/html/minimyth/conf/minimyth.conf (original)
+++ trunk/gar-minimyth/html/minimyth/conf/minimyth.conf Tue Dec 23 08:08:14
2008
@@ -80,9 +80,9 @@
# Video configurion variables.
#
# MM_VIDEO_ASPECT_RATIO
+# MM_VIDEO_DECODER
# MM_VIDEO_DEINTERLACER
# MM_VIDEO_FONT_SCALE
-# MM_VIDEO_MPEG2_DECODER
# MM_VIDEO_PLAYBACK_PROFILE
# MM_VIDEO_RESIZE_ENABLED
################################################################################
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Dec 23
08:08:14 2008
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 61 (2008-12-22):
+Changes since 61 (2008-12-23):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -12,6 +12,12 @@
MythTV 0.21: version 0.21.0, release-0-21-fixes branch
svn 19386.
MythTV trunk: version trunk.19435 trunk svn 19435.
+Modified MiniMyth configuration
+ - Added MM_VIDEO_DECODER
+ - Obsoleted MM_VIDEO_MPEG2_DECODER.
+ - Changed the meaning of MM_CODECS_URL='auto'.
+ - Changed the meaning of MM_FLASH_URL='auto'.
+
Modified support for binary codecs
- Added support for 64-bit binary codecs.
- Changed the meaning of 'auto' value for MM_CODECS_URL.
@@ -138,6 +144,8 @@
- Fixed a bug that would cause NFS boot to fail when the NFS server is
not
on the same subnet as the MiniMyth system.
- Fixed a bug that would cause mm_ss_suspend to fail.
+ - Fixed a bug that would cause the MythTV 0.20.x MPEG2 decoder to be
set
+ incorrectly.
Modified build system
- Explicitly enable XvMC and VDPAU in FFmpeg.
Modified: trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
(original)
+++ trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Tue Dec
23
08:08:14 2008
@@ -521,9 +521,9 @@
</ul>
<ul>
<li><a
href="#MM_VIDEO_ASPECT_RATIO">MM_VIDEO_ASPECT_RATIO</a></li>
+ <li><a href="#MM_VIDEO_DECODER">MM_VIDEO_DECODER</a></li>
<li><a
href="#MM_VIDEO_DEINTERLACER">MM_VIDEO_DEINTERLACER</a></li>
<li><a href="#MM_VIDEO_FONT_SCALE">MM_VIDEO_FONT_SCALE</a></li>
- <li><a
href="#MM_VIDEO_MPEG2_DECODER">MM_VIDEO_MPEG2_DECODER</a></li>
<li><a
href="#MM_VIDEO_PLAYBACK_PROFILE">MM_VIDEO_PLAYBACK_PROFILE</a></li>
<li><a
href="#MM_VIDEO_RESIZE_ENABLED">MM_VIDEO_RESIZE_ENABLED</a></li>
</ul>
@@ -540,6 +540,31 @@
Set video aspect ratio. Valid values are '4:3', '16:9'
and '16:10', with '4:3' the default.
</p>
</dd>
+ <dt
id="MM_VIDEO_DECODER"><strong>MM_VIDEO_DECODER</strong></dt>
+ <dd>
+ <p>
+ Set the decoder to use.
+ Valid values
are 'auto', 'ffmpeg', 'libmpeg2', 'vdpau', 'xvmc' and 'xvmc-vld',
with 'auto' the default.
+ </p>
+ <p>
+ If the value is 'auto',
+ then MiniMyth will pick the 'best' decoder based on the
other MiniMyth configuration settings.
+ </p>
+ <p>
+ While all decoders are supported by MythTV's internal
video player,
+ they may not be supported by the external video players
(MPlayer, VLC and Xine).
+ If the selected decoder is not supported by a particular
particular external video player,
+ then MiniMyth picks a reasonable substitute.
+ </p>
+ <p>
+ Support for the 'vdpau' decoder is experimental.
+ As a result, it is likely to contain bugs.
+ VDPAU decoder support is included in MythTV trunk, MPlayer
SVN and Xine.
+ It will not work unless you use the latest NVIDIA 180.x
series beta driver
+ (which is not included in the stable MiniMyth build) and
+ have VDPAU capable video hardware.
+ </p>
+ </dd>
<dt
id="MM_VIDEO_DEINTERLACER"><strong>MM_VIDEO_DEINTERLACER</strong></dt>
<dd>
<p>
@@ -547,7 +572,8 @@
Valid values
are 'auto', 'none', 'bobdeint', 'greedyhdeint', 'greedyhdoubleprocessdeint',
'kerneldeint',
'linearblend', 'onefield', 'openglbobdeint',
'opengldoubleratefieldorder', 'opengldoubleratekerneldeint',
'opengldoubleratelinearblend', 'opengldoublerateonefield',
'openglkerneldeint', 'opengllinearblend',
- 'openglonefield', 'yadifdeint'
and 'yadifdoubleprocessdeint', with 'none' the default.
+ 'openglonefield', 'vdpauadvanced', 'vdpauadvanceddoublerate',
'vdpaubasic', 'vdpaubasicdoublerate',
+ 'vdpaubobdeint', 'vdpauonefield', 'yadifdeint'
and 'yadifdoubleprocessdeint', with 'none' the default.
</p>
<p>
If the value is 'none', then video deinterlacing will be
disabled.
@@ -562,6 +588,15 @@
If the selected video deinterlacer is not supported by a
particular particular external video player,
then MiniMyth picks a reasonable substitute.
</p>
+ <p>
+ Support for the 'vdpau*' deinterlacers is expermimental.
+ As a result, it is likely to contain bugs
+ VDPAU deinterlacer support is included in MythTV trunk.
+ It will not work unless you use the latest NVIDIA 180.x
series beta driver
+ (which is not included in the stable MiniMyth build),
+ have VDPAU capable video hardware and
+ have configured MiniMyth to use the VDPAU decoder.
+ </p>
</dd>
<dt
id="MM_VIDEO_FONT_SCALE"><strong>MM_VIDEO_FONT_SCALE</strong></dt>
<dd>
@@ -577,23 +612,6 @@
resulting in smaller or larger MythTV fonts.
</p>
</dd>
- <dt
id="MM_VIDEO_MPEG2_DECODER"><strong>MM_VIDEO_MPEG2_DECODER</strong></dt>
- <dd>
- <p>
- Set the MPEG2 decoder to use.
- Valid values are 'auto', 'ffmpeg', 'libmpeg2', 'xvmc'
and 'xvmc-vld', with 'auto' the default.
- </p>
- <p>
- If the value is 'auto',
- then MiniMyth will pick the 'best' MPEG2 decoder based on
the other MiniMyth configuration settings.
- </p>
- <p>
- While all MPEG2 decoders are supported by MythTV's
internal video player,
- they may not be supported by the external video players
(MPlayer, VLC and Xine).
- If the selected MPEG2 decoder is not supported by a
particular particular external video player,
- then MiniMyth picks a reasonable substitute.
- </p>
- </dd>
<dt
id="MM_VIDEO_PLAYBACK_PROFILE"><strong>MM_VIDEO_PLAYBACK_PROFILE</strong></dt>
<dd>
<p>
@@ -2886,7 +2904,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2008-12-19
+ Last Updated on 2008-12-23
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_VIDEO
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_VIDEO
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_VIDEO
Tue Dec 23 08:08:14 2008
@@ -14,12 +14,15 @@
/usr/bin/test ! "${MM_VIDEO_ASPECT_RATIO}" = "16:10" ; then
mm_message_output err "error:
MM_VIDEO_ASPECT_RATIO='${MM_VIDEO_ASPECT_RATIO}' is not valid."
fi
- $value_valid = 'auto' .
- '|' . 'none' .
- '|' . 'bobdeint' .
- '|' . 'kerneldeint' .
- '|' . 'linearblend' .
- '|' . 'onefield';
+ if /usr/bin/test ! -z "${MM_VIDEO_DECODER}" && \
+ /usr/bin/test ! "${MM_VIDEO_DECODER}" = "auto" && \
+ /usr/bin/test ! "${MM_VIDEO_DECODER}" = "ffmpeg" && \
+ /usr/bin/test ! "${MM_VIDEO_DECODER}" = "libmpeg2" && \
+ /usr/bin/test ! "${MM_VIDEO_DECODER}" = "vdpau" && \
+ /usr/bin/test ! "${MM_VIDEO_DECODER}" = "xvmc" && \
+ /usr/bin/test ! "${MM_VIDEO_DECODER}" = "xvmc-vld" ; then
+ mm_message_output err "error:
MM_VIDEO_DECODER='${MM_VIDEO_DECODER}' is not valid."
+ fi
if /usr/bin/test !
-z "${MM_VIDEO_DEINTERLACER}" && \
/usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "auto" && \
/usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "none" && \
@@ -52,15 +55,6 @@
/usr/bin/test ! "${MM_VIDEO_FONT_SCALE}" -le 400 ) ; then
mm_message_output err "error:
MM_VIDEO_FONT_SCALE='${MM_VIDEO_FONT_SCALE}' is not valid."
fi
- if /usr/bin/test ! -z "${MM_VIDEO_MPEG2_DECODER}" && \
- /usr/bin/test ! "${MM_VIDEO_MPEG2_DECODER}" = "auto" && \
- /usr/bin/test ! "${MM_VIDEO_MPEG2_DECODER}" = "ffmpeg" && \
- /usr/bin/test ! "${MM_VIDEO_MPEG2_DECODER}" = "libmpeg2" && \
- /usr/bin/test ! "${MM_VIDEO_MPEG2_DECODER}" = "vdpau" && \
- /usr/bin/test ! "${MM_VIDEO_MPEG2_DECODER}" = "xvmc" && \
- /usr/bin/test ! "${MM_VIDEO_MPEG2_DECODER}" = "xvmc-vld" ; then
- mm_message_output err "error:
MM_VIDEO_MPEG2_DECODER='${MM_VIDEO_MPEG2_DECODER}' is not valid."
- fi
if /usr/bin/test ! -z "${MM_VIDEO_RESIZE_ENABLED}" && \
/usr/bin/test ! "${MM_VIDEO_RESIZE_ENABLED}" = "yes" && \
/usr/bin/test ! "${MM_VIDEO_RESIZE_ENABLED}" = "no" ; then
@@ -78,15 +72,15 @@
if /usr/bin/test -z "${MM_VIDEO_ASPECT_RATIO}" ; then
MM_VIDEO_ASPECT_RATIO='4:3'
fi
+ if /usr/bin/test -z "${MM_VIDEO_DECODER}" ; then
+ MM_VIDEO_DECODER='auto'
+ fi
if /usr/bin/test -z "${MM_VIDEO_DEINTERLACER}" ; then
MM_VIDEO_DEINTERLACER='none'
fi
if /usr/bin/test -z "${MM_VIDEO_FONT_SCALE}" ; then
MM_VIDEO_FONT_SCALE='100'
fi
- if /usr/bin/test -z "${MM_VIDEO_MPEG2_DECODER}" ; then
- MM_VIDEO_MPEG2_DECODER='auto'
- fi
if /usr/bin/test -z "${MM_VIDEO_PLAYBACK_PROFILE}" ; then
MM_VIDEO_PLAYBACK_PROFILE='MiniMyth'
fi
@@ -108,9 +102,9 @@
local conf_file=$1
conf_variable_write "${conf_file}"
MM_VIDEO_ASPECT_RATIO "${MM_VIDEO_ASPECT_RATIO}"
+ conf_variable_write "${conf_file}"
MM_VIDEO_DECODER "${MM_VIDEO_DECODER}"
conf_variable_write "${conf_file}"
MM_VIDEO_DEINTERLACER "${MM_VIDEO_DEINTERLACER}"
conf_variable_write "${conf_file}"
MM_VIDEO_FONT_SCALE "${MM_VIDEO_FONT_SCALE}"
- conf_variable_write "${conf_file}"
MM_VIDEO_MPEG2_DECODER "${MM_VIDEO_MPEG2_DECODER}"
conf_variable_write "${conf_file}"
MM_VIDEO_PLAYBACK_PROFILE "${MM_VIDEO_PLAYBACK_PROFILE}"
conf_variable_write "${conf_file}"
MM_VIDEO_RESIZE_ENABLED "${MM_VIDEO_RESIZE_ENABLED}"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/obsolete
Tue Dec 23 08:08:14 2008
@@ -98,6 +98,7 @@
MM_TZ
MM_UPDATE_URL
MM_VIDEO_DEINTERLACE_ENABLED
+MM_VIDEO_MPEG2_DECODER
MM_X_DISPLAYSIZE_X
MM_X_DISPLAYSIZE_Y
MM_X_DVI_ENABLED
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/video
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/video
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/video
Tue Dec 23 08:08:14 2008
@@ -29,22 +29,22 @@
case "${MM_X_DRIVER}" in
intel_810)
- /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
- /usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='xvmc'
+ /usr/bin/test "${MM_VIDEO_DECODER}" = "auto" &&
MM_VIDEO_DECODER='xvmc'
+ /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
XVMC_LIB='/usr/lib/libI810XvMC.so.1' && \
/usr/bin/test -e ${XVMC_LIB} && \
/bin/sed -i "s...@mm_xvmc_lib@%${XVMC_LIB}%"
/etc/X11/XvMCConfig
;;
intel_915)
- /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
- /usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DECODER}" = "auto" &&
MM_VIDEO_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
XVMC_LIB='/usr/lib/libIntelXvMC.so.1' && \
/usr/bin/test -e ${XVMC_LIB} && \
/bin/sed -i "s...@mm_xvmc_lib@%${XVMC_LIB}%"
/etc/X11/XvMCConfig
;;
nvidia)
- /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
- /usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DECODER}" = "auto" &&
MM_VIDEO_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
XVMC_LIB='/usr/lib/nvidia/libXvMCNVIDIA.so.1' && \
/usr/bin/test -e ${XVMC_LIB} && \
/bin/sed -i "s...@mm_xvmc_lib@%${XVMC_LIB}%"
/etc/X11/XvMCConfig
@@ -53,38 +53,38 @@
/bin/sed -i "s...@mm_xvmc_lib@%${XVMC_LIB}%"
/etc/X11/XvMCConfig
;;
openchrome)
- /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
- /usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='xvmc-vld'
+ /usr/bin/test "${MM_VIDEO_DECODER}" = "auto" &&
MM_VIDEO_DECODER='xvmc-vld'
+ /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
XVMC_LIB='/usr/lib/libchromeXvMC.so.1' && \
/usr/bin/test -e ${XVMC_LIB} && \
/bin/sed -i "s...@mm_xvmc_lib@%${XVMC_LIB}%"
/etc/X11/XvMCConfig
;;
radeon)
- /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
- /usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DECODER}" = "auto" &&
MM_VIDEO_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
;;
radeonhd)
- /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
- /usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DECODER}" = "auto" &&
MM_VIDEO_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
;;
savage)
- /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
- /usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DECODER}" = "auto" &&
MM_VIDEO_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
;;
sis)
- /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
- /usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DECODER}" = "auto" &&
MM_VIDEO_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
;;
vmware)
- /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
- /usr/bin/test "${MM_VIDEO_MPEG2_DECODER}" = "auto" &&
MM_VIDEO_MPEG2_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DECODER}" = "auto" &&
MM_VIDEO_DECODER='ffmpeg'
+ /usr/bin/test "${MM_VIDEO_DEINTERLACER}" = "auto" &&
MM_VIDEO_DEINTERLACER='bobdeint'
;;
esac
/bin/sed -i "s...@mm_xvmc_lib@%%" /etc/X11/XvMCConfig
if ( /usr/bin/test ${MM_VERSION_MYTH_BINARY_MAJOR} -eq 0 && \
/usr/bin/test ${MM_VERSION_MYTH_BINARY_MINOR} -eq 20 ) ; then
-
mm_mythdb_settings_set 'PreferredMPEG2Decoder' "${MM_VIDEO_MPEG2_DECODER}"
+
mm_mythdb_settings_set 'PreferredMPEG2Decoder' "${MM_VIDEO_DECODER}"
mm_mythdb_settings_set 'DeinterlaceFilter' "${MM_VIDEO_DEINTERLACER}"
else
if /usr/bin/test -n "${MM_VIDEO_PLAYBACK_PROFILE}" ; then
@@ -95,7 +95,7 @@
pref_videorenderer=''
pref_osdrenderer=''
pref_osdfade=''
- case "${MM_VIDEO_MPEG2_DECODER}" in
+ case "${MM_VIDEO_DECODER}" in
ffmpeg)
pref_decoder='ffmpeg'
pref_videorenderer='xv-blit'
@@ -202,7 +202,7 @@
fi
fi
- case "${MM_VIDEO_MPEG2_DECODER}" in
+ case "${MM_VIDEO_DECODER}" in
ffmpeg)
/usr/bin/test ! -e /usr/bin/mplayer && /usr/bin/test -e
/usr/bin/mplayer-svn && /bin/ln -s mplayer-svn /usr/bin/mplayer
/bin/sed -i "s...@video_driver@%xv%"
/home/minimyth/.xine/config
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_VIDEO.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_VIDEO.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_VIDEO.pm
Tue Dec 23 08:08:14 2008
@@ -19,6 +19,17 @@
value_default => '4:3',
value_valid => '4:3|16:9|16:10'
};
+$var_list{'MM_VIDEO_DECODER'} =
+{
+ value_default => 'auto',
+ value_valid => 'auto' .
+ '|' . 'ffmpeg' .
+ '|' . 'libmpeg2' .
+ '|' . 'vdpau' .
+ '|' . 'xvmc' .
+ '|' . 'xvmc-vld',
+ value_none => ''
+};
$var_list{'MM_VIDEO_DEINTERLACER'} =
{
prerequisite =>
['MM_VERSION_MYTH_BINARY_MAJOR', 'MM_VERSION_MYTH_BINARY_MINOR'],
@@ -105,17 +116,6 @@
return '' if ($value > 400);
return '[0-9]+';
}
-};
-$var_list{'MM_VIDEO_MPEG2_DECODER'} =
-{
- value_default => 'auto',
- value_valid => 'auto' .
- '|' . 'ffmpeg' .
- '|' . 'libmpeg2' .
- '|' . 'vdpau' .
- '|' . 'xvmc' .
- '|' . 'xvmc-vld',
- value_none => ''
};
$var_list{'MM_VIDEO_PLAYBACK_PROFILE'} =
{
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/obsolete
Tue Dec 23 08:08:14 2008
@@ -99,6 +99,7 @@
MM_TZ
MM_UPDATE_URL
MM_VIDEO_DEINTERLACE_ENABLED
+MM_VIDEO_MPEG2_DECODER
MM_X_DISPLAYSIZE_X
MM_X_DISPLAYSIZE_Y
MM_X_DVI_ENABLED
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/video.pm
Tue Dec 23 08:08:14 2008
@@ -17,60 +17,60 @@
$minimyth->message_output('info', "configuring video ...");
- my $deinterlacer = $minimyth->var_get('MM_VIDEO_DEINTERLACER');
- my $mpeg2_decoder = $minimyth->var_get('MM_VIDEO_MPEG2_DECODER');
- my $xvmc_lib = '';
+ my $deinterlacer = $minimyth->var_get('MM_VIDEO_DEINTERLACER');
+ my $decoder = $minimyth->var_get('MM_VIDEO_DECODER');
+ my $xvmc_lib = '';
given ($minimyth->var_get('MM_X_DRIVER'))
{
when (/^intel_810$/)
{
- ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
- ($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'xvmc');
+ ($decoder eq 'auto') && ($decoder = 'xvmc');
+ ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
(-e '/usr/lib/libI810XvMC.so.1') && ($xvmc_lib
= '/usr/lib/libI810XvMC.so.1');
}
when (/^intel_915$/)
{
- ($deinterlacer eq 'auto' ) && ($deinterlacer = 'bobdeint');
- ($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'ffmpeg');
+ ($decoder eq 'auto') && ($decoder = 'ffmpeg');
+ ($deinterlacer eq 'auto' ) && ($deinterlacer = 'bobdeint');
(-e '/usr/lib/libIntelXvMC.so.1') && ($xvmc_lib
= '/usr/lib/libIntelXvMC.so.1');
}
when (/^nvidia$/)
{
- ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
- ($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'ffmpeg');
+ ($decoder eq 'auto') && ($decoder = 'ffmpeg');
+ ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
(-e '/usr/lib/nvidia/libXvMCNVIDIA_dynamic.so.1') &&
($xvmc_lib = '/usr/lib/nvidia/libXvMCNVIDIA_dynamic.so.1');
(-e '/usr/lib/nvidia/libXvMCNVIDIA.so.1') &&
($xvmc_lib = '/usr/lib/nvidia/libXvMCNVIDIA.so.1');
}
when (/^openchrome$/)
{
- ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
- ($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'xvmc-vld');
+ ($decoder eq 'auto') && ($decoder = 'xvmc-vld');
+ ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
(-e '/usr/lib/libchromeXvMC.so.1') && ($xvmc_lib
= '/usr/lib/libchromeXvMC.so.1');
}
when (/^radeon$/)
{
- ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
- ($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'ffmpeg');
+ ($decoder eq 'auto') && ($decoder = 'ffmpeg');
+ ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
}
when (/^radeonhd$/)
{
- ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
- ($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'ffmpeg');
+ ($decoder eq 'auto') && ($decoder = 'ffmpeg');
+ ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
}
when (/^savage$/)
{
- ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
- ($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'ffmpeg');
+ ($decoder eq 'auto') && ($decoder = 'ffmpeg');
+ ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
}
when (/^sis$/)
{
- ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
- ($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'ffmpeg');
+ ($decoder eq 'auto') && ($decoder = 'ffmpeg');
+ ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
}
when (/^vmware$/)
{
- ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
- ($mpeg2_decoder eq 'auto') && ($mpeg2_decoder = 'ffmpeg');
+ ($decoder eq 'auto') && ($decoder = 'ffmpeg');
+ ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
}
}
$minimyth->file_replace_variable(
@@ -80,8 +80,8 @@
if ( ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MAJOR') == 0) &&
($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR') == 20) )
{
- $minimyth->mythdb_settings_set('PreferredMPEG2Decoder',
$minimyth->var_get('MM_VIDEO_MPEG2_DECODER'));
- $minimyth->mythdb_settings_set('DeinterlaceFilter',
$minimyth->var_get('MM_VIDEO_DEINTERLACER') );
+ $minimyth->mythdb_settings_set('DeinterlaceFilter',
$deinterlacer);
+ $minimyth->mythdb_settings_set('PreferredMPEG2Decoder', $decoder);
}
else
{
@@ -102,7 +102,7 @@
}
$pref{'pref_cmp0'} = '> 0 0';
$pref{'pref_cmp1'} = '';
- given ($mpeg2_decoder)
+ given ($decoder)
{
when (/^ffmpeg$/)
{
@@ -191,7 +191,7 @@
my $vdpau_false;
my $xvmc_true;
my $xvmc_false;
- given ($mpeg2_decoder)
+ given ($decoder)
{
when (/^ffmpeg$/)
{
Modified: trunk/gar-minimyth/script/minimyth.conf.mk
==============================================================================
--- trunk/gar-minimyth/script/minimyth.conf.mk (original)
+++ trunk/gar-minimyth/script/minimyth.conf.mk Tue Dec 23 08:08:14 2008
@@ -18,7 +18,7 @@
)
# Configuration file (minimyth.conf) version.
-mm_CONF_VERSION ?= 37
+mm_CONF_VERSION ?= 38
#-------------------------------------------------------------------------------
# Variables that you are likely to be override based on your environment.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
