From b568ac73b9d2e063eb04693e4610a9932035b696 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 27 Feb 2014 21:27:23 -0500
Subject: IMAGE: Move video codecs to image/

---
 image/codecs/indeo3.h | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 image/codecs/indeo3.h

(limited to 'image/codecs/indeo3.h')

diff --git a/image/codecs/indeo3.h b/image/codecs/indeo3.h
new file mode 100644
index 0000000000..275cbc1654
--- /dev/null
+++ b/image/codecs/indeo3.h
@@ -0,0 +1,94 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+/* Intel Indeo 3 decompressor, derived from ffmpeg.
+ *
+ * Original copyright note:
+ * Intel Indeo 3 (IV31, IV32, etc.) video decoder for ffmpeg
+ * written, produced, and directed by Alan Smithee
+ */
+
+#ifndef IMAGE_CODECS_INDEO3_H
+#define IMAGE_CODECS_INDEO3_H
+
+#include "image/codecs/codec.h"
+
+namespace Image {
+
+/**
+ * Intel Indeo 3 decoder.
+ *
+ * Used in video:
+ *  - AVIDecoder
+ *  - VMDDecoder
+ */
+class Indeo3Decoder : public Codec {
+public:
+	Indeo3Decoder(uint16 width, uint16 height);
+	~Indeo3Decoder();
+
+	const Graphics::Surface *decodeImage(Common::SeekableReadStream *stream);
+	Graphics::PixelFormat getPixelFormat() const;
+
+	static bool isIndeo3(Common::SeekableReadStream &stream);
+
+private:
+	Graphics::Surface *_surface;
+
+	Graphics::PixelFormat _pixelFormat;
+
+	static const int _corrector_type_0[24];
+	static const int _corrector_type_2[8];
+	static const uint32 correction[];
+	static const uint32 correctionloworder[];
+	static const uint32 correctionhighorder[];
+
+	struct YUVBufs {
+		byte *Ybuf;
+		byte *Ubuf;
+		byte *Vbuf;
+		byte *the_buf;
+		uint32 the_buf_size;
+		uint16 y_w, y_h;
+		uint16 uv_w, uv_h;
+	};
+
+	YUVBufs _iv_frame[2];
+	YUVBufs *_cur_frame;
+	YUVBufs *_ref_frame;
+
+	byte *_ModPred;
+	uint16 *_corrector_type;
+
+	void buildModPred();
+	void allocFrames();
+
+	void decodeChunk(byte *cur, byte *ref, int width, int height,
+			const byte *buf1, uint32 fflags2, const byte *hdr,
+			const byte *buf2, int min_width_160);
+};
+
+} // End of namespace Image
+
+#endif
-- 
cgit v1.2.3


From 08ea14a8d0e1a1478d1f486edeecea3e619e0cd0 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 27 Feb 2014 21:27:24 -0500
Subject: IMAGE: Make Codec take a stream reference; change function name to
 decodeFrame

---
 image/codecs/indeo3.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'image/codecs/indeo3.h')

diff --git a/image/codecs/indeo3.h b/image/codecs/indeo3.h
index 275cbc1654..f1b406d40d 100644
--- a/image/codecs/indeo3.h
+++ b/image/codecs/indeo3.h
@@ -48,7 +48,7 @@ public:
 	Indeo3Decoder(uint16 width, uint16 height);
 	~Indeo3Decoder();
 
-	const Graphics::Surface *decodeImage(Common::SeekableReadStream *stream);
+	const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream);
 	Graphics::PixelFormat getPixelFormat() const;
 
 	static bool isIndeo3(Common::SeekableReadStream &stream);
-- 
cgit v1.2.3


From 57aa610f0c6199fbe41fc5de495356aa29fae6b8 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 27 Feb 2014 21:27:25 -0500
Subject: IMAGE: Update comments

---
 image/codecs/indeo3.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'image/codecs/indeo3.h')

diff --git a/image/codecs/indeo3.h b/image/codecs/indeo3.h
index f1b406d40d..0ff0265250 100644
--- a/image/codecs/indeo3.h
+++ b/image/codecs/indeo3.h
@@ -39,8 +39,9 @@ namespace Image {
 /**
  * Intel Indeo 3 decoder.
  *
+ * Used by BMP/AVI.
+ *
  * Used in video:
- *  - AVIDecoder
  *  - VMDDecoder
  */
 class Indeo3Decoder : public Codec {
-- 
cgit v1.2.3