Make the calculation of black borders in the video display happen on resize rather than on draw.

Originally committed to SVN as r4287.
This commit is contained in:
Thomas Goyne 2010-05-16 06:38:59 +00:00
parent 624df412ea
commit 94cf2949f1
2 changed files with 42 additions and 57 deletions

View file

@ -231,52 +231,16 @@ void VideoDisplay::Render() try {
wxASSERT(wxIsMainThread()); wxASSERT(wxIsMainThread());
VideoContext *context = VideoContext::Get(); VideoContext *context = VideoContext::Get();
wxASSERT(context);
if (!context->IsLoaded()) return; if (!context->IsLoaded()) return;
// Set GL context
SetCurrent(*context->GetGLContext(this)); SetCurrent(*context->GetGLContext(this));
// Get sizes int sw, sh;
int w, h, sw, sh, pw, ph;
GetClientSize(&w, &h);
wxASSERT(w > 0);
wxASSERT(h > 0);
context->GetScriptSize(sw, sh); context->GetScriptSize(sw, sh);
pw = context->GetWidth();
ph = context->GetHeight();
wxASSERT(pw > 0);
wxASSERT(ph > 0);
// Freesized transform
dx1 = 0;
dy1 = 0;
dx2 = w;
dy2 = h;
if (freeSize) {
// Set aspect ratio
float thisAr = float(w)/float(h);
float vidAr = context->GetAspectRatioType() == 0 ? float(pw)/float(ph) : context->GetAspectRatioValue();
// Window is wider than video, blackbox left/right
if (thisAr - vidAr > 0.01f) {
int delta = int(w-vidAr*h);
dx1 += delta/2;
dx2 -= delta;
}
// Video is wider than window, blackbox top/bottom
else if (vidAr - thisAr > 0.01f) {
int delta = int(h-w/vidAr);
dy1 += delta/2;
dy2 -= delta;
}
}
videoOut->SetViewport(dx1, dy1, dx2, dy2); videoOut->SetViewport(dx1, dy1, dx2, dy2);
videoOut->Render(sw, sh); videoOut->Render(sw, sh);
DrawTVEffects(); DrawTVEffects(sw, sh);
if (visualMode == -1) SetVisualMode(0, false); if (visualMode == -1) SetVisualMode(0, false);
if (visual && (visual->mouseX > INT_MIN || visual->mouseY > INT_MIN || Options.AsBool(L"Always show visual tools"))) { if (visual && (visual->mouseX > INT_MIN || visual->mouseY > INT_MIN || Options.AsBool(L"Always show visual tools"))) {
@ -307,15 +271,12 @@ catch (...) {
VideoContext::Get()->Reset(); VideoContext::Get()->Reset();
} }
void VideoDisplay::DrawTVEffects() { void VideoDisplay::DrawTVEffects(int sw, int sh) {
int sw,sh;
VideoContext *context = VideoContext::Get();
context->GetScriptSize(sw,sh);
bool drawOverscan = Options.AsBool(_T("Show Overscan Mask")); bool drawOverscan = Options.AsBool(_T("Show Overscan Mask"));
if (drawOverscan) { if (drawOverscan) {
// Get aspect ratio // Get aspect ratio
double ar = context->GetAspectRatioValue(); double ar = VideoContext::Get()->GetAspectRatioValue();
// Based on BBC's guidelines: http://www.bbc.co.uk/guidelines/dq/pdf/tv/tv_standards_london.pdf // Based on BBC's guidelines: http://www.bbc.co.uk/guidelines/dq/pdf/tv/tv_standards_london.pdf
// 16:9 or wider // 16:9 or wider
@ -368,13 +329,14 @@ void VideoDisplay::UpdateSize() {
if (!con->IsLoaded()) return; if (!con->IsLoaded()) return;
if (!IsShownOnScreen()) return; if (!IsShownOnScreen()) return;
if (freeSize) { int vidW = con->GetWidth();
GetClientSize(&w,&h); int vidH = con->GetHeight();
} assert(vidW > 0);
else { assert(vidH > 0);
if (con->GetAspectRatioType() == 0) w = int(con->GetWidth() * zoomValue);
else w = int(con->GetHeight() * zoomValue * con->GetAspectRatioValue()); if (!freeSize) {
h = int(con->GetHeight() * zoomValue); h = vidH * zoomValue;
w = con->GetAspectRatioType() == 0 ? vidW * zoomValue : vidH * zoomValue * con->GetAspectRatioValue();
// Sizers ignore SetClientSize/SetSize, so only use them to calculate // Sizers ignore SetClientSize/SetSize, so only use them to calculate
// what size is required after including the borders // what size is required after including the borders
@ -395,6 +357,35 @@ void VideoDisplay::UpdateSize() {
locked = false; locked = false;
} }
GetClientSize(&w,&h);
wxASSERT(w > 0);
wxASSERT(h > 0);
dx1 = 0;
dy1 = 0;
dx2 = w;
dy2 = h;
if (freeSize) {
// Set aspect ratio
float displayAr = float(w) / float(h);
float videoAr = con->GetAspectRatioType() == 0 ? float(vidW)/float(vidH) : con->GetAspectRatioValue();
// Window is wider than video, blackbox left/right
if (displayAr - videoAr > 0.01f) {
int delta = w - videoAr * h;
dx1 = delta / 2;
dx2 = w - delta;
}
// Video is wider than window, blackbox top/bottom
else if (videoAr - displayAr > 0.01f) {
int delta = h - w / videoAr;
dy1 = delta / 2;
dy2 = h - delta;
}
}
Refresh(false); Refresh(false);
} }
@ -535,12 +526,6 @@ void VideoDisplay::OnCopyCoords(wxCommandEvent &) {
} }
void VideoDisplay::ConvertMouseCoords(int &x,int &y) { void VideoDisplay::ConvertMouseCoords(int &x,int &y) {
int w,h;
GetClientSize(&w,&h);
wxASSERT(dx2 > 0);
wxASSERT(dy2 > 0);
wxASSERT(w > 0);
wxASSERT(h > 0);
x = (x-dx1)*w/dx2; x = (x-dx1)*w/dx2;
y = (y-dy1)*h/dy2; y = (y-dy1)*h/dy2;
} }

View file

@ -86,7 +86,7 @@ private:
bool locked; bool locked;
/// @brief Draw the appropriate overscan masks for the current aspect ratio /// @brief Draw the appropriate overscan masks for the current aspect ratio
void DrawTVEffects(); void DrawTVEffects(int sh, int sw);
/// @brief Draw an overscan mask /// @brief Draw an overscan mask
/// @param sizeH The amount of horizontal overscan on one side /// @param sizeH The amount of horizontal overscan on one side
/// @param sizeV The amount of vertical overscan on one side /// @param sizeV The amount of vertical overscan on one side