Author: pebender
Date: Tue Dec 23 19:34:03 2008
New Revision: 4125
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
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/video.pm
Log:
- Modified init so that it configures MythTV to use xv rather than vdpau
when MM_VIDEO_DECODER='vdpau' and MythTV is either version 0.20.x or
version 0.21.x.
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
19:34:03 2008
@@ -13,6 +13,9 @@
MythTV trunk: version trunk.19435 trunk svn 19435.
Modified mediaplayers
+ - Modified init so that it configures MythTV to use xv rather than
vdpau
+ when MM_VIDEO_DECODER='vdpau' and MythTV is either version 0.20.x or
+ version 0.21.x.
- Updated FFmpeg VDPAU support.
- Updated MPlayer VDPAU support.
- Updated Xine VDPAU support.
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 19:34:03 2008
@@ -84,7 +84,11 @@
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_DECODER}"
+ if /usr/bin/test "${MM_VIDEO_DECODER}" = "vdpau" ; then
+ mm_mythdb_settings_set 'PreferredMPEG2Decoder' "ffmpeg"
+ else
+
mm_mythdb_settings_set 'PreferredMPEG2Decoder' "${MM_VIDEO_DECODER}"
+ fi
mm_mythdb_settings_set 'DeinterlaceFilter' "${MM_VIDEO_DEINTERLACER}"
else
if /usr/bin/test -n "${MM_VIDEO_PLAYBACK_PROFILE}" ; then
@@ -109,9 +113,16 @@
pref_osdfade='0'
;;
vdpau)
- pref_decoder='vdpau'
- pref_videorenderer='vdpau'
- pref_osdrenderer='vdpau'
+ if ( /usr/bin/test ${MM_VERSION_MYTH_BINARY_MAJOR}
-eq 0 && \
+ /usr/bin/test ${MM_VERSION_MYTH_BINARY_MINOR} -eq
21 ) ; then
+ pref_decoder='ffmpeg'
+ pref_videorenderer='xv-blit'
+ pref_osdrenderer='softblend'
+ else
+ pref_decoder='vdpau'
+ pref_videorenderer='vdpau'
+ pref_osdrenderer='vdpau'
+ fi
pref_osdfade='0'
;;
xvmc)
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 19:34:03 2008
@@ -31,7 +31,7 @@
when (/^intel_915$/)
{
($decoder eq 'auto') && ($decoder = 'ffmpeg');
- ($deinterlacer eq 'auto' ) && ($deinterlacer = 'bobdeint');
+ ($deinterlacer eq 'auto') && ($deinterlacer = 'bobdeint');
(-e '/usr/lib/libIntelXvMC.so.1') && ($xvmc_lib
= '/usr/lib/libIntelXvMC.so.1');
}
when (/^nvidia$/)
@@ -81,7 +81,14 @@
($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR') == 20) )
{
$minimyth->mythdb_settings_set('DeinterlaceFilter',
$deinterlacer);
- $minimyth->mythdb_settings_set('PreferredMPEG2Decoder', $decoder);
+ if ($decoder eq 'vdpau')
+ {
+
$minimyth->mythdb_settings_set('PreferredMPEG2Decoder', 'ffmpeg');
+ }
+ else
+ {
+ $minimyth->mythdb_settings_set('PreferredMPEG2Decoder',
$decoder);
+ }
}
else
{
@@ -120,9 +127,19 @@
}
when (/^vdpau$/)
{
- $pref{'pref_decoder'} = 'vdpau';
- $pref{'pref_videorenderer'} = 'vdpau';
- $pref{'pref_osdrenderer'} = 'vdpau';
+ if (
($minimyth->var_get('MM_VERSION_MYTH_BINARY_MAJOR') == 0) &&
+
($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR') == 21) )
+ {
+ $pref{'pref_decoder'} = 'ffmpeg';
+ $pref{'pref_videorenderer'} = 'xv-blit';
+ $pref{'pref_osdrenderer'} = 'softblend';
+ }
+ else
+ {
+ $pref{'pref_decoder'} = 'vdpau';
+ $pref{'pref_videorenderer'} = 'vdpau';
+ $pref{'pref_osdrenderer'} = 'vdpau';
+ }
$pref{'pref_osdfade'} = '0';
}
when (/^xvmc$/)
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
