aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris "Koying" Browet <cbro@semperpax.com>2015-04-11 17:27:32 +0200
committerChris "Koying" Browet <cbro@semperpax.com>2015-04-11 18:12:54 +0200
commit0500be8123a45353239e5e0dbf6cc3db5bf24057 (patch)
tree7ab1e7ee76cf06c16649198e116d6d0fa8b5e6da
parentc3116fdfd515b674242a44d0b0eadbe423ec5794 (diff)
FIX: [droid] amlcodec scale after aml egl
-rw-r--r--xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
index 8c7d4a11d3..0503becd7c 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
@@ -1684,15 +1684,8 @@ bool CAMLCodec::OpenDecoder(CDVDStreamInfo &hints)
std::string strScaler;
SysfsUtils::GetString("/sys/class/ppmgr/ppscaler", strScaler);
- if (strScaler.find("enabled") != std::string::npos) // Scaler not enabled, use screen size
- {
- CLog::Log(LOGDEBUG, "ppscaler not enabled");
- std::string mode;
- SysfsUtils::GetString("/sys/class/display/mode", mode);
- RESOLUTION_INFO res;
- if (aml_mode_to_resolution(mode.c_str(), &res))
- m_display_rect = CRect(0, 0, res.iScreenWidth, res.iScreenHeight);
- }
+ if (strScaler.find("enabled") == std::string::npos) // Scaler not enabled, use screen size
+ m_display_rect = CRect(0, 0, CDisplaySettings::Get().GetCurrentResolutionInfo().iScreenWidth, CDisplaySettings::Get().GetCurrentResolutionInfo().iScreenHeight);
/*
// if display is set to 1080xxx, then disable deinterlacer for HD content
@@ -2317,7 +2310,7 @@ void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect)
SetVideo3dMode(MODE_3D_DISABLE);
}
-#if 0
+#if 1
std::string s_dst_rect = StringUtils::Format("%i,%i,%i,%i",
(int)dst_rect.x1, (int)dst_rect.y1,
(int)dst_rect.Width(), (int)dst_rect.Height());