Ticket #9205: qt_scaler_v2.diff

video/qt_decoder.cpp

@@ -67 +67 @@
         _numStreams = 0;
         _fd = 0;
         _scaledSurface = 0;
+        _scaleFactorX = 1;
+        _scaleFactorY = 1;
         _dirtyPalette = false;
         _resFork = new Common::MacResManager();
 
@@ -82 +84 @@
         if (_videoStreamIndex < 0)
                 return 0;
 
-        return _streams[_videoStreamIndex]->width / getScaleMode();
+        return Common::Rational(_streams[_videoStreamIndex]->width,getScaleFactorX()).toInt();
 }
 
 uint16 QuickTimeDecoder::getHeight() const {
         if (_videoStreamIndex < 0)
                 return 0;
-
-        return _streams[_videoStreamIndex]->height / getScaleMode();
+                
+        return Common::Rational(_streams[_videoStreamIndex]->height,getScaleFactorY()).toInt();
 }
 
 uint32 QuickTimeDecoder::getFrameCount() const {
@@ -113 +115 @@
         return _streams[_videoStreamIndex]->codec_tag;
 }
 
-ScaleMode QuickTimeDecoder::getScaleMode() const {
+Common::Rational QuickTimeDecoder::getScaleFactorX() const {
         if (_videoStreamIndex < 0)
-                return kScaleNormal;
+                return 1;
 
-        return (ScaleMode)(_scaleMode * _streams[_videoStreamIndex]->scaleMode);
+        return (_scaleFactorX * _streams[_videoStreamIndex]->scaleFactorX);
 }
 
+Common::Rational QuickTimeDecoder::getScaleFactorY() const {
+        if (_videoStreamIndex < 0)
+                return 1;
+
+        return (_scaleFactorY * _streams[_videoStreamIndex]->scaleFactorY);
+}
+
 uint32 QuickTimeDecoder::getFrameDuration() {
         if (_videoStreamIndex < 0)
                 return 0;
@@ -231 +240 @@
 }
 
 Surface *QuickTimeDecoder::scaleSurface(Surface *frame) {
-        if (getScaleMode() == kScaleNormal)
+        if (getScaleFactorX() == 1 && getScaleFactorY() == 1)
                 return frame;
 
         assert(_scaledSurface);
 
-        for (uint32 j = 0; j < _scaledSurface->h; j++)
-                for (uint32 k = 0; k < _scaledSurface->w; k++)
-                        memcpy(_scaledSurface->getBasePtr(k, j), frame->getBasePtr(k * getScaleMode(), j * getScaleMode()), frame->bytesPerPixel);
+        for (int32 j = 0; j < _scaledSurface->h; j++)
+                for (int32 k = 0; k < _scaledSurface->w; k++)
+                        memcpy(_scaledSurface->getBasePtr(k, j), frame->getBasePtr(int(getScaleFactorX() * k ) , int(getScaleFactorY() * j)), frame->bytesPerPixel);
 
         return _scaledSurface;
 }
@@ -376 +385 @@
         if (_videoStreamIndex >= 0) {
                 _videoCodec = createCodec(getCodecTag(), getBitsPerPixel());
 
-                if (getScaleMode() != kScaleNormal) {
+                if (getScaleFactorX() != 1 || getScaleFactorY() != 1) {
                         // We have to initialize the scaled surface
                         _scaledSurface = new Surface();
                         _scaledSurface->create(getWidth(), getHeight(), getPixelFormat().bytesPerPixel);
@@ -592 +601 @@
         _fd->skip(12);
         uint32 yMod = _fd->readUint32BE();
         _fd->skip(16);
+        
+        _scaleFactorX = Common::Rational(65536, xMod);
+        _scaleFactorY = Common::Rational(65536, yMod);
 
-        if (xMod != yMod)
-                error("X and Y resolution modifiers differ");
+        debug(1, "readMVHD(): scaleFactorX = %f", double(_scaleFactorX));
+        debug(1, "readMVHD(): scaleFactorY = %f", double(_scaleFactorY));
 
-        if (xMod == 0x8000)
-                _scaleMode = kScaleHalf;
-        else if (xMod == 0x4000)
-                _scaleMode = kScaleQuarter;
-        else
-                _scaleMode = kScaleNormal;
-
-        debug(1, "readMVHD(): scaleMode = %d", (int)_scaleMode);
-
         _fd->readUint32BE(); // preview time
         _fd->readUint32BE(); // preview duration
         _fd->readUint32BE(); // poster time
@@ -687 +690 @@
         _fd->skip(12);
         uint32 yMod = _fd->readUint32BE();
         _fd->skip(16);
+        
+        st->scaleFactorX = Common::Rational(65536, xMod);
+        st->scaleFactorY = Common::Rational(65536, yMod);
+        
+        debug(1, "readTKHD(): scaleFactorX = %f", double(st->scaleFactorX));
+        debug(1, "readTKHD(): scaleFactorY = %f", double(st->scaleFactorY));
 
-        if (xMod != yMod)
-                error("X and Y resolution modifiers differ");
-
-        if (xMod == 0x8000)
-                st->scaleMode = kScaleHalf;
-        else if (xMod == 0x4000)
-                st->scaleMode = kScaleQuarter;
-        else
-                st->scaleMode = kScaleNormal;
-
-        debug(1, "readTKHD(): scaleMode = %d", (int)_scaleMode);
-
         // these are fixed-point, 16:16
         // uint32 tkWidth = _fd->readUint32BE() >> 16; // track width
         // uint32 tkHeight = _fd->readUint32BE() >> 16; // track height

video/qt_decoder.h

@@ -36 +36 @@
 
 #include "common/scummsys.h"
 #include "common/queue.h"
+#include "common/rational.h"
 
 #include "graphics/video/video_decoder.h"
 #include "graphics/video/codecs/codec.h"
@@ -50 +51 @@
 
 namespace Graphics {
 
-enum ScaleMode {
-        kScaleNormal = 1,
-        kScaleHalf = 2,
-        kScaleQuarter = 4
-};
 
 class QuickTimeDecoder : public RewindableVideoDecoder {
 public:
@@ -217 +213 @@
                 uint32 nb_frames;
                 uint32 duration;
                 uint32 start_time;
-                ScaleMode scaleMode;
+                Common::Rational scaleFactorX;
+                Common::Rational scaleFactorY;
         };
 
         const ParseTable *_parseTable;
@@ -230 +227 @@
         MOVStreamContext *_partial;
         uint32 _numStreams;
         int _ni;
-        ScaleMode _scaleMode;
+        Common::Rational _scaleFactorX;
+        Common::Rational _scaleFactorY;
         MOVStreamContext *_streams[20];
         byte _palette[256 * 3];
         bool _dirtyPalette;
@@ -260 +258 @@
 
         Surface *_scaledSurface;
         Surface *scaleSurface(Surface *frame);
-        ScaleMode getScaleMode() const;
+        Common::Rational getScaleFactorX() const;
+        Common::Rational getScaleFactorY() const;
 
         void pauseVideoIntern(bool pause);