Skip to content

Commit

Permalink
video calibration fix, broke after 9ad6f4e
Browse files Browse the repository at this point in the history
  • Loading branch information
@FernetMenta
FernetMenta committed Aug 1, 2012
1 parent e15269b commit 0cc8b87
Show file tree
Hide file tree
Showing 4 changed files with 118 additions and 59 deletions.
1 change: 1 addition & 0 deletions xbmc/settings/GUIWindowSettingsScreenCalibration.cpp
View file
Expand Up @@ -117,6 +117,7 @@ bool CGUIWindowSettingsScreenCalibration::OnMessage(CGUIMessage& message)
{
case GUI_MSG_WINDOW_DEINIT:
{
g_settings.UpdateCalibrations();
g_settings.Save();
g_graphicsContext.SetCalibrating(false);
g_windowManager.ShowOverlay(OVERLAY_STATE_SHOWN);
Expand Down
170 changes: 112 additions & 58 deletions xbmc/settings/Settings.cpp
View file
Expand Up @@ -488,89 +488,143 @@ bool CSettings::LoadCalibration(const TiXmlElement* pRoot, const CStdString& str
const TiXmlElement *pResolution = pElement->FirstChildElement("resolution");
while (pResolution)
{
// get the data for this resolution
CStdString mode;
XMLUtils::GetString(pResolution, "description", mode);
// find this resolution in our resolution vector
for (unsigned int res = 0; res < m_ResInfo.size(); res++)
{
if (res == RES_WINDOW)
continue;
// get the data for this calibration
RESOLUTION_INFO cal;

if (m_ResInfo[res].strMode == mode)
{ // found, read in the rest of the information for this item
const TiXmlElement *pOverscan = pResolution->FirstChildElement("overscan");
if (pOverscan)
{
GetInteger(pOverscan, "left", m_ResInfo[res].Overscan.left, 0, -m_ResInfo[res].iWidth / 4, m_ResInfo[res].iWidth / 4);
GetInteger(pOverscan, "top", m_ResInfo[res].Overscan.top, 0, -m_ResInfo[res].iHeight / 4, m_ResInfo[res].iHeight / 4);
GetInteger(pOverscan, "right", m_ResInfo[res].Overscan.right, m_ResInfo[res].iWidth, m_ResInfo[res].iWidth / 2, m_ResInfo[res].iWidth*3 / 2);
GetInteger(pOverscan, "bottom", m_ResInfo[res].Overscan.bottom, m_ResInfo[res].iHeight, m_ResInfo[res].iHeight / 2, m_ResInfo[res].iHeight*3 / 2);
}
XMLUtils::GetString(pResolution, "description", cal.strMode);
XMLUtils::GetInt(pResolution, "subtitles", cal.iSubtitles);
XMLUtils::GetFloat(pResolution, "pixelratio", cal.fPixelRatio);
#ifdef HAS_XRANDR
XMLUtils::GetFloat(pResolution, "refreshrate", cal.fRefreshRate);
XMLUtils::GetString(pResolution, "output", cal.strOutput);
XMLUtils::GetString(pResolution, "xrandrid", cal.strId);
#endif

// get the appropriate "safe graphics area" = 10% for 4x3, 3.5% for 16x9
float fSafe;
if (res == RES_PAL_4x3 || res == RES_NTSC_4x3 || res == RES_PAL60_4x3 || res == RES_HDTV_480p_4x3)
fSafe = 0.1f;
else
fSafe = 0.035f;

GetInteger(pResolution, "subtitles", m_ResInfo[res].iSubtitles, (int)((1 - fSafe)*m_ResInfo[res].iHeight), m_ResInfo[res].iHeight / 2, m_ResInfo[res].iHeight*5 / 4);
GetFloat(pResolution, "pixelratio", m_ResInfo[res].fPixelRatio, 128.0f / 117.0f, 0.5f, 2.0f);
/* CLog::Log(LOGDEBUG, " calibration for %s %ix%i", m_ResInfo[res].strMode, m_ResInfo[res].iWidth, m_ResInfo[res].iHeight);
CLog::Log(LOGDEBUG, " subtitle yposition:%i pixelratio:%03.3f offsets:(%i,%i)->(%i,%i)",
m_ResInfo[res].iSubtitles, m_ResInfo[res].fPixelRatio,
m_ResInfo[res].Overscan.left, m_ResInfo[res].Overscan.top,
m_ResInfo[res].Overscan.right, m_ResInfo[res].Overscan.bottom);*/
}
const TiXmlElement *pOverscan = pResolution->FirstChildElement("overscan");
if (pOverscan)
{
XMLUtils::GetInt(pOverscan, "left", cal.Overscan.left);
XMLUtils::GetInt(pOverscan, "top", cal.Overscan.top);
XMLUtils::GetInt(pOverscan, "right", cal.Overscan.right);
XMLUtils::GetInt(pOverscan, "bottom", cal.Overscan.bottom);
}

// mark calibration as not updated
// we must not delete those, resolution just might not be available
cal.iWidth = cal.iHeight = 0;

// store calibration
m_Calibrations.push_back(cal);

// iterate around
pResolution = pResolution->NextSiblingElement("resolution");
}
ApplyCalibrations();
return true;
}

void CSettings::ApplyCalibrations()
{
// apply all calibrations to the resolutions
for (size_t i = 0; i < m_Calibrations.size(); ++i)
{
// find resolutions
for (size_t res = 0; res < m_ResInfo.size(); ++res)
{
if (res == RES_WINDOW)
continue;
if (m_Calibrations[i].strMode.Equals(m_ResInfo[res].strMode))
{
// overscan
m_ResInfo[res].Overscan.left = m_Calibrations[i].Overscan.left;
if (m_ResInfo[res].Overscan.left < -m_ResInfo[res].iWidth/4)
m_ResInfo[res].Overscan.left = -m_ResInfo[res].iWidth/4;
if (m_ResInfo[res].Overscan.left > m_ResInfo[res].iWidth/4)
m_ResInfo[res].Overscan.left = m_ResInfo[res].iWidth/4;

m_ResInfo[res].Overscan.top = m_Calibrations[i].Overscan.top;
if (m_ResInfo[res].Overscan.top < -m_ResInfo[res].iHeight/4)
m_ResInfo[res].Overscan.top = -m_ResInfo[res].iHeight/4;
if (m_ResInfo[res].Overscan.top > m_ResInfo[res].iHeight/4)
m_ResInfo[res].Overscan.top = m_ResInfo[res].iHeight/4;

m_ResInfo[res].Overscan.right = m_Calibrations[i].Overscan.right;
if (m_ResInfo[res].Overscan.right < m_ResInfo[res].iWidth / 2)
m_ResInfo[res].Overscan.right = m_ResInfo[res].iWidth / 2;
if (m_ResInfo[res].Overscan.right > m_ResInfo[res].iWidth * 3/2)
m_ResInfo[res].Overscan.right = m_ResInfo[res].iWidth *3/2;

m_ResInfo[res].Overscan.bottom = m_Calibrations[i].Overscan.bottom;
if (m_ResInfo[res].Overscan.bottom < m_ResInfo[res].iHeight / 2)
m_ResInfo[res].Overscan.bottom = m_ResInfo[res].iHeight / 2;
if (m_ResInfo[res].Overscan.bottom > m_ResInfo[res].iHeight * 3/2)
m_ResInfo[res].Overscan.bottom = m_ResInfo[res].iHeight * 3/2;

m_ResInfo[res].iSubtitles = m_Calibrations[i].iSubtitles;
if (m_ResInfo[res].iSubtitles < m_ResInfo[res].iHeight / 2)
m_ResInfo[res].iSubtitles = m_ResInfo[res].iHeight / 2;
if (m_ResInfo[res].iSubtitles > m_ResInfo[res].iHeight* 5/4)
m_ResInfo[res].iSubtitles = m_ResInfo[res].iHeight* 5/4;

m_ResInfo[res].fPixelRatio = m_Calibrations[i].fPixelRatio;
if (m_ResInfo[res].fPixelRatio < 0.5f)
m_ResInfo[res].fPixelRatio = 0.5f;
if (m_ResInfo[res].fPixelRatio > 2.0f)
m_ResInfo[res].fPixelRatio = 2.0f;
break;
}
}
}
}

/* Hmm, these stuff shouldn't be releaded, they should be used instead of our internal
id counter to select what resolution is affected by this settings
#ifdef HAS_XRANDR
const CStdString def("");
CStdString val;
GetString(pResolution, "xrandrid", val, def);
strncpy(m_ResInfo[iRes].strId, val.c_str(), sizeof(m_ResInfo[iRes].strId));
GetString(pResolution, "output", val, def);
strncpy(m_ResInfo[iRes].strOutput, val.c_str(), sizeof(m_ResInfo[iRes].strOutput));
GetFloat(pResolution, "refreshrate", m_ResInfo[iRes].fRefreshRate, 0, 0, 200);
#endif
*/
void CSettings::UpdateCalibrations()
{
for (size_t res = RES_DESKTOP; res < m_ResInfo.size(); ++res)
{
// find calibration
bool found = false;
for (std::vector<RESOLUTION_INFO>::iterator it = m_Calibrations.begin(); it != m_Calibrations.end(); ++it)
{
if (it->strMode.Equals(m_ResInfo[res].strMode))
{
// TODO: erase calibrations with default values
(*it) = m_ResInfo[res];
found = true;
break;
}
}
if (!found)
m_Calibrations.push_back(m_ResInfo[res]);
}
return true;
}

bool CSettings::SaveCalibration(TiXmlNode* pRootNode) const
{
TiXmlElement xmlRootElement("resolutions");
TiXmlNode *pRoot = pRootNode->InsertEndChild(xmlRootElement);

// save WINDOW, DESKTOP and CUSTOM resolution
for (size_t i = RES_WINDOW ; i < m_ResInfo.size() ; i++)
// save calibrations
for (size_t i = 0 ; i < m_Calibrations.size() ; i++)
{
// Write the resolution tag
TiXmlElement resElement("resolution");
TiXmlNode *pNode = pRoot->InsertEndChild(resElement);
// Now write each of the pieces of information we need...
XMLUtils::SetString(pNode, "description", m_ResInfo[i].strMode);
XMLUtils::SetInt(pNode, "subtitles", m_ResInfo[i].iSubtitles);
XMLUtils::SetFloat(pNode, "pixelratio", m_ResInfo[i].fPixelRatio);
XMLUtils::SetString(pNode, "description", m_Calibrations[i].strMode);
XMLUtils::SetInt(pNode, "subtitles", m_Calibrations[i].iSubtitles);
XMLUtils::SetFloat(pNode, "pixelratio", m_Calibrations[i].fPixelRatio);
#ifdef HAS_XRANDR
XMLUtils::SetFloat(pNode, "refreshrate", m_ResInfo[i].fRefreshRate);
XMLUtils::SetString(pNode, "output", m_ResInfo[i].strOutput);
XMLUtils::SetString(pNode, "xrandrid", m_ResInfo[i].strId);
XMLUtils::SetFloat(pNode, "refreshrate", m_Calibrations[i].fRefreshRate);
XMLUtils::SetString(pNode, "output", m_Calibrations[i].strOutput);
XMLUtils::SetString(pNode, "xrandrid", m_Calibrations[i].strId);
#endif
// create the overscan child
TiXmlElement overscanElement("overscan");
TiXmlNode *pOverscanNode = pNode->InsertEndChild(overscanElement);
XMLUtils::SetInt(pOverscanNode, "left", m_ResInfo[i].Overscan.left);
XMLUtils::SetInt(pOverscanNode, "top", m_ResInfo[i].Overscan.top);
XMLUtils::SetInt(pOverscanNode, "right", m_ResInfo[i].Overscan.right);
XMLUtils::SetInt(pOverscanNode, "bottom", m_ResInfo[i].Overscan.bottom);
XMLUtils::SetInt(pOverscanNode, "left", m_Calibrations[i].Overscan.left);
XMLUtils::SetInt(pOverscanNode, "top", m_Calibrations[i].Overscan.top);
XMLUtils::SetInt(pOverscanNode, "right", m_Calibrations[i].Overscan.right);
XMLUtils::SetInt(pOverscanNode, "bottom", m_Calibrations[i].Overscan.bottom);
}
return true;
}
Expand Down
4 changes: 4 additions & 0 deletions xbmc/settings/Settings.h
View file
Expand Up @@ -335,6 +335,7 @@ class CSettings
int GetCurrentProfileId() const;

std::vector<RESOLUTION_INFO> m_ResInfo;
std::vector<RESOLUTION_INFO> m_Calibrations;

// utility functions for user data folders

Expand Down Expand Up @@ -381,6 +382,9 @@ class CSettings
static bool GetString(const TiXmlElement* pRootElement, const char *strTagName, CStdString& strValue, const CStdString& strDefaultValue);
bool GetString(const TiXmlElement* pRootElement, const char *strTagName, char *szValue, const CStdString& strDefaultValue);
bool GetSource(const CStdString &category, const TiXmlNode *source, CMediaSource &share);

void ApplyCalibrations();
void UpdateCalibrations();
protected:
void GetSources(const TiXmlElement* pRootElement, const CStdString& strTagName, VECSOURCES& items, CStdString& strDefault);
bool SetSources(TiXmlNode *root, const char *section, const VECSOURCES &shares, const char *defaultPath);
Expand Down
2 changes: 1 addition & 1 deletion xbmc/windowing/WinSystem.cpp
View file
Expand Up @@ -45,7 +45,7 @@ CWinSystemBase::~CWinSystemBase()
bool CWinSystemBase::InitWindowSystem()
{
UpdateResolutions();

g_settings.ApplyCalibrations();
return true;
}

Expand Down

0 comments on commit 0cc8b87

Please sign in to comment.