jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc: add PR2549

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-04-07 13:27:55 +02:00
parent 2bb5339db6
commit e8d322129a
1 changed files with 129 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
packages/mediacenter/xbmc/patches/xbmc-990.44-PR2549.patch Normal file
View File

@ -0,0 +1,129 @@
diff -Naur xbmc-12.1/xbmc/cores/omxplayer/OMXImage.cpp xbmc-12.1.patch/xbmc/cores/omxplayer/OMXImage.cpp
--- xbmc-12.1/xbmc/cores/omxplayer/OMXImage.cpp 2013-03-18 04:42:24.000000000 +0100
+++ xbmc-12.1.patch/xbmc/cores/omxplayer/OMXImage.cpp 2013-04-06 21:56:20.697642093 +0200
@@ -487,30 +487,47 @@
{
RESOLUTION_INFO& res_info = g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()];
const bool transposed = m_orientation & 4;
- const int gui_width = transposed ? res_info.iHeight:res_info.iWidth;
- const int gui_height = transposed ? res_info.iWidth:res_info.iHeight;
- const unsigned int max_width = min(gui_width, 2048);
- const unsigned int max_height = min(gui_height, 2048);
-
- if(!max_width || !max_height)
- return false;
+ unsigned int max_width = width;
+ unsigned int max_height = height;
+ const unsigned int gui_width = transposed ? res_info.iHeight:res_info.iWidth;
+ const unsigned int gui_height = transposed ? res_info.iWidth:res_info.iHeight;
+ const float aspect = (float)m_width / m_height;
- const float ar = (float)width/(float)height;
- // bigger than maximum, so need to clamp
- if (width > max_width || height > max_height) {
- // wider than max, so clamp width first
- if (ar > (float)max_width/(float)max_height)
- {
- width = max_width;
- height = (float)max_width / ar + 0.5f;
- // taller than max, so clamp height first
- } else {
- height = max_height;
- width = (float)max_height * ar + 0.5f;
+ if (max_width == 0 || max_height == 0)
+ {
+ max_height = g_advancedSettings.m_imageRes;
+
+ if (g_advancedSettings.m_fanartRes > g_advancedSettings.m_imageRes)
+ { // a separate fanart resolution is specified - check if the image is exactly equal to this res
+ if (fabsf(aspect / (16.0f/9.0f) - 1.0f) <= 0.01f && m_height >= g_advancedSettings.m_fanartRes)
+ { // special case for 16x9 images larger than the fanart res
+ max_height = g_advancedSettings.m_fanartRes;
+ }
}
- return true;
+ max_width = max_height * 16/9;
}
+ if (gui_width)
+ max_width = min(max_width, gui_width);
+ if (gui_height)
+ max_height = min(max_height, gui_height);
+
+ max_width = min(max_width, 2048U);
+ max_height = min(max_height, 2048U);
+
+
+ width = m_width;
+ height = m_height;
+ if (width > max_width || height > max_height)
+ {
+ if ((unsigned int)(max_width / aspect + 0.5f) > max_height)
+ max_width = (unsigned int)(max_height * aspect + 0.5f);
+ else
+ max_height = (unsigned int)(max_width / aspect + 0.5f);
+ width = max_width;
+ height = max_height;
+ return true;
+ }
return false;
}
@@ -549,7 +566,6 @@
CLog::Log(LOGERROR, "%s::%s %s m_width=%d m_height=%d\n", CLASSNAME, __func__, inputFile.c_str(), m_width, m_height);
return false;
}
- ClampLimits(m_width, m_height);
m_is_open = true;
@@ -719,25 +735,6 @@
m_decoder_open = true;
- if(width == 0 || height == 0)
- {
- height = g_advancedSettings.m_imageRes;
- if (g_advancedSettings.m_fanartRes > g_advancedSettings.m_imageRes)
- { // a separate fanart resolution is specified - check if the image is exactly equal to this res
- if (m_width == (unsigned int)g_advancedSettings.m_fanartRes * 16/9 &&
- m_height == (unsigned int)g_advancedSettings.m_fanartRes)
- { // special case for fanart res
- height = g_advancedSettings.m_fanartRes;
- }
- }
- width = height * 16/9;
- if(!width || !height)
- {
- width = g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iWidth;
- height = g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iHeight;
- }
- }
-
ClampLimits(width, height);
// set input format
diff -Naur xbmc-12.1/xbmc/guilib/Texture.cpp xbmc-12.1.patch/xbmc/guilib/Texture.cpp
--- xbmc-12.1/xbmc/guilib/Texture.cpp 2013-03-18 04:42:22.000000000 +0100
+++ xbmc-12.1.patch/xbmc/guilib/Texture.cpp 2013-04-06 21:54:12.381273419 +0200
@@ -224,7 +224,7 @@
if(omx_image.ReadFile(texturePath))
{
- if(omx_image.Decode(omx_image.GetWidth(), omx_image.GetHeight()))
+ if(omx_image.Decode(maxWidth, maxHeight))
{
Allocate(omx_image.GetDecodedWidth(), omx_image.GetDecodedHeight(), XB_FMT_A8R8G8B8);
diff -Naur xbmc-12.1/xbmc/pictures/Picture.cpp xbmc-12.1.patch/xbmc/pictures/Picture.cpp
--- xbmc-12.1/xbmc/pictures/Picture.cpp 2013-03-18 04:42:24.000000000 +0100
+++ xbmc-12.1.patch/xbmc/pictures/Picture.cpp 2013-04-06 21:54:12.381273419 +0200
@@ -104,7 +104,7 @@
uint32_t max_height = g_advancedSettings.m_imageRes;
if (g_advancedSettings.m_fanartRes > g_advancedSettings.m_imageRes)
{ // a separate fanart resolution is specified - check if the image is exactly equal to this res
- if (width * 9 == height * 16 && height >= g_advancedSettings.m_fanartRes)
+ if (fabsf((float)width / (float)height / (16.0f/9.0f) - 1.0f) <= 0.01f && height >= g_advancedSettings.m_fanartRes)
{ // special case for 16x9 images larger than the fanart res
max_height = g_advancedSettings.m_fanartRes;
}