mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix incorrect handling of flipped video when the texture size is larger than the video size.

Browse source 
Originally committed to SVN as r3742.
This commit is contained in:
Thomas Goyne 2009-10-27 20:59:27 +00:00
parent dcfdb02e6c
commit 15cf221a3f
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
aegisub/src/video_out_gl.cpp
View file

@ -107,6 +107,7 @@ VideoOutGL::VideoOutGL()
frameWidth(0), frameWidth(0),
frameHeight(0), frameHeight(0),
frameFormat(0), frameFormat(0),
frameFlipped(false),
textureIdList(), textureIdList(),
textureList(), textureList(),
textureCount(0), textureCount(0),
@ -153,7 +154,7 @@ void VideoOutGL::DetectOpenGLCapabilities() {
/// @param bpp The frame's bytes per pixel /// @param bpp The frame's bytes per pixel
void VideoOutGL::InitTextures(int width, int height, GLenum format, int bpp, bool flipped) { void VideoOutGL::InitTextures(int width, int height, GLenum format, int bpp, bool flipped) {
// Do nothing if the frame size and format are unchanged // Do nothing if the frame size and format are unchanged
if (width == frameWidth && height == frameHeight && format == frameFormat) return; if (width == frameWidth && height == frameHeight && format == frameFormat && flipped == frameFlipped) return;
wxLogDebug("VideoOutGL::InitTextures: Video size: %dx%d\n", width, height); wxLogDebug("VideoOutGL::InitTextures: Video size: %dx%d\n", width, height);
DetectOpenGLCapabilities(); DetectOpenGLCapabilities();
@ -218,22 +219,21 @@ void VideoOutGL::InitTextures(int width, int height, GLenum format, int bpp, boo
ti.texTop = 1.0f / (2 * h); ti.texTop = 1.0f / (2 * h);
} }
ti.texRight = 1.0f - ti.texLeft;
ti.texBottom = 1.0f - ti.texTop;
if (flipped) {
float t = ti.texTop;
ti.texTop = ti.texBottom;
ti.texBottom = ti.texTop;
}
// destW/H is the percent of the output which this texture covers
ti.destW = float(w) / width; ti.destW = float(w) / width;
ti.destH = float(h) / height; ti.destH = float(h) / height;
ti.textureID = textureIdList[i * textureCols + j]; ti.textureID = textureIdList[i * textureCols + j];
ti.dataOffset = sourceY * width * bpp + sourceX * bpp; ti.dataOffset = sourceY * width * bpp + sourceX * bpp;
ti.texRight = 1.0f - ti.texLeft;
ti.texBottom = 1.0f - ti.texTop;
if (flipped) {
ti.texBottom = ti.texTop - float(h - ti.sourceH) / h;
ti.texTop = 1.0f - ti.texTop - float(h - ti.sourceH) / h;
ti.dataOffset = (height - sourceY - ti.sourceH) * width * bpp + sourceX * bpp;
}
// Actually create the texture and set the scaling mode // Actually create the texture and set the scaling mode
glBindTexture(GL_TEXTURE_2D, ti.textureID); glBindTexture(GL_TEXTURE_2D, ti.textureID);
if (GLenum err = glGetError()) throw VideoOutOpenGLException(L"glBindTexture", err); if (GLenum err = glGetError()) throw VideoOutOpenGLException(L"glBindTexture", err);

2
aegisub/src/video_out_gl.h
View file

@ -64,6 +64,8 @@ private:
int frameHeight; int frameHeight;
/// The frame format which the texture grid has been set up for /// The frame format which the texture grid has been set up for
GLenum frameFormat; GLenum frameFormat;
/// Whether the grid is set up for flipped video
bool frameFlipped;
/// List of OpenGL texture ids used in the grid /// List of OpenGL texture ids used in the grid
std::vector<GLuint> textureIdList; std::vector<GLuint> textureIdList;
/// List of precalculated texture display information /// List of precalculated texture display information