[Scummvm-git-logs] scummvm master -> cf96b50f08faac7e13b990043c0171798d8a6000

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
83188eace9 VIDEO: Expose the bitCount of AVIVideoTrack bitmap headers
cf96b50f08 TITANIC: Fix videos playing vertically flipped


Commit: 83188eace90de5ae56fe772d07f4c9471e416038
    https://github.com/scummvm/scummvm/commit/83188eace90de5ae56fe772d07f4c9471e416038
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-06T20:32:25-04:00

Commit Message:
VIDEO: Expose the bitCount of AVIVideoTrack bitmap headers

Changed paths:
    video/avi_decoder.h



diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 3581b65..db9928d 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -189,6 +189,7 @@ protected:
 
 		uint16 getWidth() const { return _bmInfo.width; }
 		uint16 getHeight() const { return _bmInfo.height; }
+		uint16 getBitCount() const { return _bmInfo.bitCount; }
 		Graphics::PixelFormat getPixelFormat() const;
 		int getCurFrame() const { return _curFrame; }
 		int getFrameCount() const { return _frameCount; }


Commit: cf96b50f08faac7e13b990043c0171798d8a6000
    https://github.com/scummvm/scummvm/commit/cf96b50f08faac7e13b990043c0171798d8a6000
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-06T20:33:24-04:00

Commit Message:
TITANIC: Fix videos playing vertically flipped

Changed paths:
    engines/titanic/support/avi_surface.cpp



diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index a45d586..45c3ce9 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -223,10 +223,10 @@ void AVISurface::setupDecompressor() {
 		bool flag = false;
 		if (idx == 0 && _videoSurface && 
 				_videoSurface->getPitch() == _movieFrameSurface[idx]->pitch) {
-			const Graphics::PixelFormat &ff = _decoder->getVideoTrack(0).getPixelFormat();
+			const uint bitCount = _decoder->getVideoTrack(0).getBitCount();
 			const int vDepth = _videoSurface->getPixelDepth();
 
-			switch (ff.bpp()) {
+			switch (bitCount) {
 			case 15:
 				flag = vDepth == 1;
 				break;
@@ -248,6 +248,9 @@ void AVISurface::setupDecompressor() {
 			_framePixels = new Graphics::ManagedSurface(_decoder->getWidth(), _decoder->getHeight(),
 				_decoder->getVideoTrack(0).getPixelFormat());
 		} else if (idx == 0) {
+			// The original developers used a vertical flipped playback to indicate
+			// an incompatibility between source video and dest surface bit-depths,
+			// which would result in poor playback performance
 			_videoSurface->_flipVertically = true;
 		}
 	}