aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorFelix Domke <felix.domke@multimedia-labs.de>2009-07-17 12:46:44 +0200
committerFelix Domke <felix.domke@multimedia-labs.de>2009-07-17 12:46:44 +0200
commitcff4a983555bab7eff226d39e92681cc12f0eb2d (patch)
tree5fa6333b28b3d4aad9dcdda9e7be0a143172831f /lib/python
parentf27bd5e1b2c49b0db87dbac70298ad33d2e4d537 (diff)
parent4058ce38d580cd8693fecf3e62132fadc5e5e975 (diff)
downloadenigma2-cff4a983555bab7eff226d39e92681cc12f0eb2d.tar.gz
enigma2-cff4a983555bab7eff226d39e92681cc12f0eb2d.zip
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp18
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index 917d4cc5..94f2ee38 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -92,8 +92,9 @@ eServiceDVD::eServiceDVD(eServiceReference ref):
m_current_trick(0),
m_pump(eApp, 1)
{
- int aspect = DDVD_16_9;
+ int aspect = DDVD_16_9;
int policy = DDVD_PAN_SCAN;
+ int policy2 = DDVD_PAN_SCAN;
char tmp[255];
ssize_t rd;
@@ -130,7 +131,22 @@ eServiceDVD::eServiceDVD(eServiceReference ref):
close(fd);
}
+#ifdef DDVD_SUPPORTS_16_10_SCALING
+ fd = open("/proc/stb/video/policy2", O_RDONLY);
+ if (fd > -1)
+ {
+ rd = read(fd, tmp, 255);
+ if (rd > 6 && !strncmp(tmp, "bestfit", 7))
+ policy2 = DDVD_JUSTSCALE;
+ else if (rd > 8 && !strncmp(tmp, "letterbox", 9))
+ policy2 = DDVD_LETTERBOX;
+ close(fd);
+ }
+ ddvd_set_video_ex(m_ddvdconfig, aspect, policy, policy2, DDVD_PAL /*unused*/);
+#else
ddvd_set_video(m_ddvdconfig, aspect, policy, DDVD_PAL /*unused*/);
+#warning please update libdreamdvd for 16:10 scaling support!
+#endif
CONNECT(m_sn->activated, eServiceDVD::gotMessage);
CONNECT(m_pump.recv_msg, eServiceDVD::gotThreadMessage);