Author: pebender
Date: Sun Dec 21 18:01:20 2008
New Revision: 4117
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/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/video.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/home/minimyth/.mplayer/config
Log:
- Added initial vdpau support to MiniMyth init.
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
Sun Dec 21 18:01:20 2008
@@ -37,6 +37,12 @@
/usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "openglkerneldeint" && \
/usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "opengllinearblend" && \
/usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "openglonefield" && \
+ /usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "vdpauadvanced" && \
+ /usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "vdpauadvanceddoublerate" && \
+ /usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "vdpaubasic" && \
+ /usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "vdpaubasicdoublerate" && \
+ /usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "vdpaubobdeint" && \
+ /usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "vdpauonefield" && \
/usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "yadifdeint" && \
/usr/bin/test ! "${MM_VIDEO_DEINTERLACER}"
= "yadifdoubleprocessdeint" ; then
mm_message_output err "error:
MM_VIDEO_DEINTERLACER='${MM_VIDEO_DEINTERLACER}' is not valid."
@@ -50,6 +56,7 @@
/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."
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
Sun Dec 21 18:01:20 2008
@@ -108,6 +108,12 @@
pref_osdrenderer='softblend'
pref_osdfade='0'
;;
+ vdpau)
+ pref_decoder='vdpau'
+ pref_videorenderer='vdpau'
+ pref_osdrenderer='vdpau'
+ pref_osdfade='0'
+ ;;
xvmc)
pref_decoder='xvmc'
pref_videorenderer='xvmc-blit'
@@ -199,27 +205,43 @@
case "${MM_VIDEO_MPEG2_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
- /bin/sed -i "s...@xvmc_true@%\#%"
/home/minimyth/.mplayer/config
- /bin/sed -i "s...@xvmc_false@%%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@video_driver@%xv%"
/home/minimyth/.xine/config
+ /bin/sed -i "s...@vdpau_true@%\#%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@vdpau_false@%%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@xvmc_true@%\#%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@xvmc_false@%%"
/home/minimyth/.mplayer/config
;;
libmpeg2)
/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
- /bin/sed -i "s...@xvmc_true@%\#%"
/home/minimyth/.mplayer/config
- /bin/sed -i "s...@xvmc_false@%%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@video_driver@%xv%"
/home/minimyth/.xine/config
+ /bin/sed -i "s...@vdpau_true@%\#%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@vdpau_false@%%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@xvmc_true@%\#%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@xvmc_false@%%"
/home/minimyth/.mplayer/config
+ ;;
+ vdpau)
+ /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@%vdpau%"
/home/minimyth/.xine/config
+ /bin/sed -i "s...@vdpau_true@%%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@vdpau_false@%\#%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@xvmc_true@%\#%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@xvmc_false@%%"
/home/minimyth/.mplayer/config
;;
xvmc)
/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@%xvmc%"
/home/minimyth/.xine/config
- /bin/sed -i "s...@xvmc_true@%%"
/home/minimyth/.mplayer/config
- /bin/sed -i "s...@xvmc_false@%\#%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@video_driver@%xvmc%"
/home/minimyth/.xine/config
+ /bin/sed -i "s...@vdpau_true@%\#%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@vdpau_false@%%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@xvmc_true@%%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@xvmc_false@%\#%"
/home/minimyth/.mplayer/config
;;
xvmc-vld)
/usr/bin/test ! -e /usr/bin/mplayer && /usr/bin/test -e
/usr/bin/mplayer-vld && /bin/ln -s mplayer-vld /usr/bin/mplayer
- /bin/sed -i "s...@video_driver@%xxmc%"
/home/minimyth/.xine/config
- /bin/sed -i "s...@xvmc_true@%%"
/home/minimyth/.mplayer/config
- /bin/sed -i "s...@xvmc_false@%\#%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@video_driver@%xxmc%"
/home/minimyth/.xine/config
+ /bin/sed -i "s...@vdpau_true@%\#%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@vdpau_false@%%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@xvmc_true@%%"
/home/minimyth/.mplayer/config
+ /bin/sed -i "s...@xvmc_false@%\#%"
/home/minimyth/.mplayer/config
;;
*)
mm_message_output err "error: something is very wrong in
the 'video' init script."
@@ -233,7 +255,7 @@
/bin/sed
-i "s...@deinterlace_plugin@%none%"
/home/minimyth/.xine/config
/bin/sed
-i "s...@bobdeint@%%"
/home/minimyth/.mplayer/config
;;
- bobdeint|openglbobdeint)
+ bobdeint|openglbobdeint|vdpaubobdeint)
/bin/sed
-i "s...@deinterlace_by_default@%1%"
/home/minimyth/.xine/config
/bin/sed
-i "s...@deinterlace_plugin@%tvtime:method=ScalerBob%"
/home/minimyth/.xine/config
/bin/sed
-i "s...@bobdeint@%:bobdeint%"
/home/minimyth/.mplayer/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
Sun Dec 21 18:01:20 2008
@@ -29,8 +29,8 @@
my $name = shift;
my $value_valid = '';
- if ( ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MAJOR') == 0) &&
- ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR') == 20) )
+ if ( ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MAJOR') == 0)
&&
+ ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR') == 20)
)
{
$value_valid = 'auto' .
'|' . 'none' .
@@ -39,6 +39,28 @@
'|' . 'linearblend' .
'|' . 'onefield';
}
+ elsif ( ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MAJOR') == 0)
&&
+ ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR') == 21)
)
+ {
+ $value_valid = 'auto' .
+ '|' . 'none' .
+ '|' . 'bobdeint' .
+ '|' . 'greedyhdeint' .
+ '|' . 'greedyhdoubleprocessdeint' .
+ '|' . 'kerneldeint' .
+ '|' . 'linearblend' .
+ '|' . 'onefield' .
+ '|' . 'openglbobdeint' .
+ '|' . 'opengldoubleratefieldorder' .
+ '|' . 'opengldoubleratekerneldeint' .
+ '|' . 'opengldoubleratelinearblend' .
+ '|' . 'opengldoublerateonefield' .
+ '|' . 'openglkerneldeint' .
+ '|' . 'opengllinearblend' .
+ '|' . 'openglonefield' .
+ '|' . 'yadifdeint' .
+ '|' . 'yadifdoubleprocessdeint';
+ }
else
{
$value_valid = 'auto' .
@@ -57,6 +79,12 @@
'|' . 'openglkerneldeint' .
'|' . 'opengllinearblend' .
'|' . 'openglonefield' .
+ '|' . 'vdpauadvanced' .
+ '|' . 'vdpauadvanceddoublerate' .
+ '|' . 'vdpaubasic' .
+ '|' . 'vdpaubasicdoublerate' .
+ '|' . 'vdpaubobdeint' .
+ '|' . 'vdpauonefield' .
'|' . 'yadifdeint' .
'|' . 'yadifdoubleprocessdeint';
}
@@ -84,6 +112,7 @@
value_valid => 'auto' .
'|' . 'ffmpeg' .
'|' . 'libmpeg2' .
+ '|' . 'vdpau' .
'|' . 'xvmc' .
'|' . 'xvmc-vld',
value_none => ''
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
Sun Dec 21 18:01:20 2008
@@ -118,6 +118,13 @@
$pref{'pref_osdrenderer'} = 'softblend';
$pref{'pref_osdfade'} = '0';
}
+ when (/^vdpau$/)
+ {
+ $pref{'pref_decoder'} = 'vdpau';
+ $pref{'pref_videorenderer'} = 'vdpau';
+ $pref{'pref_osdrenderer'} = 'vdpau';
+ $pref{'pref_osdfade'} = '0';
+ }
when (/^xvmc$/)
{
$pref{'pref_decoder'} = 'xvmc';
@@ -180,6 +187,8 @@
my $mplayer;
my $video_driver;
+ my $vdpau_true;
+ my $vdpau_false;
my $xvmc_true;
my $xvmc_false;
given ($mpeg2_decoder)
@@ -188,6 +197,8 @@
{
$mplayer = 'mplayer-svn';
$video_driver = 'xv';
+ $vdpau_true = '#';
+ $vdpau_false = '';
$xvmc_true = '#';
$xvmc_false = '';
}
@@ -195,6 +206,17 @@
{
$mplayer = 'mplayer-svn';
$video_driver = 'xv';
+ $vdpau_true = '#';
+ $vdpau_false = '';
+ $xvmc_true = '#';
+ $xvmc_false = '';
+ }
+ when (/^vdpau$/)
+ {
+ $mplayer = 'mplayer-svn';
+ $video_driver = 'vdpau';
+ $vdpau_true = '';
+ $vdpau_false = '#';
$xvmc_true = '#';
$xvmc_false = '';
}
@@ -202,6 +224,8 @@
{
$mplayer = 'mplayer-svn';
$video_driver = 'xvmc';
+ $vdpau_true = '#';
+ $vdpau_false = '';
$xvmc_true = '';
$xvmc_false = '#';
}
@@ -209,6 +233,8 @@
{
$mplayer = 'mplayer-vld';
$video_driver = 'xxmc';
+ $vdpau_true = '#';
+ $vdpau_false = '';
$xvmc_true = '';
$xvmc_false = '#';
}
@@ -230,7 +256,7 @@
$deinterlace_plugin = 'none';
$bobdeint = '';
}
- when (/^bobdeint|openglbobdeint$/)
+ when (/^bobdeint|openglbobdeint|vdpaubobdeint$/)
{
$deinterlace_by_default = '1';
$deinterlace_plugin = 'ScalerBob';
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/home/minimyth/.mplayer/config
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/home/minimyth/.mplayer/config
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/home/minimyth/.mplayer/config
Sun Dec 21 18:01:20 2008
@@ -1,7 +1,9 @@
ao=alsa
+...@vdpau_true@vo=vdpau,xv
+...@vdpau_true@vc=ffmpeg12vdpau,ffh264vdpau,ffvc1vdpau,ffwmv3vdpau,
@xvmc_t...@vo=xvmc@BOBDEINT@,xv
@xvmc_t...@vc=ffmpeg12mc,
-...@xvmc_false@vo=xv
+...@vdpau_false@@xvmc_fa...@vo=xv
monitoraspe...@monitoraspect@
fontconfig=1
font='Liberation Sans'
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
