VIDEO: Add support for odd-sized Bink-videos

2 files changed, 22 insertions, 2 deletions

diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index 620316806f..30632cdd6c 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -260,7 +260,23 @@ BinkDecoder::BinkVideoTrack::BinkVideoTrack(uint32 width, uint32 height, const G
 			_colHighHuffman[i].symbols[j] = j;
 	}
 
-	_surface.create(width, height, format);
+	// Make the surface even-sized:
+	_surfaceHeight = height;
+	_surfaceWidth = width;
+
+	if (height & 1) {
+		_surfaceHeight++;
+	}
+	if (width & 1) {
+		_surfaceWidth++;
+	}
+
+	_surface.create(_surfaceWidth, _surfaceHeight, format);
+	// Since we over-allocate to make surfaces even-sized
+	// we need to set the actual VIDEO size back into the
+	// surface.
+	_surface.h = height;
+	_surface.w = width;
 
 	// Give the planes a bit extra space
 	width  = _surface.w + 32;
@@ -329,9 +345,11 @@ void BinkDecoder::BinkVideoTrack::decodePacket(VideoFrame &frame) {
 
 	// Convert the YUV data we have to our format
 	// We're ignoring alpha for now
+	// The width used here is the surface-width, and not the video-width
+	// to allow for odd-sized videos.
 	assert(_curPlanes[0] && _curPlanes[1] && _curPlanes[2]);
 	Graphics::convertYUV420ToRGB(&_surface, _curPlanes[0], _curPlanes[1], _curPlanes[2],
-			_surface.w, _surface.h, _surface.w, _surface.w >> 1);
+			_surfaceWidth, _surfaceHeight, _surfaceWidth, _surfaceWidth >> 1);
 
 	// And swap the planes with the reference planes
 	for (int i = 0; i < 4; i++)
diff --git a/video/bink_decoder.h b/video/bink_decoder.h
index 150e91aab7..27d3aa3691 100644
--- a/video/bink_decoder.h
+++ b/video/bink_decoder.h
@@ -231,6 +231,8 @@ private:
 		int _frameCount;
 
 		Graphics::Surface _surface;
+		int _surfaceWidth; ///< The actual surface width
+		int _surfaceHeight; ///< The actual surface height
 
 		uint32 _id; ///< The BIK FourCC.