diff options
Diffstat (limited to 'video')
-rw-r--r-- | video/avi_decoder.cpp | 7 | ||||
-rw-r--r-- | video/avi_decoder.h | 25 | ||||
-rw-r--r-- | video/codecs/cdtoons.cpp | 4 | ||||
-rw-r--r-- | video/codecs/cinepak.cpp | 6 | ||||
-rw-r--r-- | video/codecs/cinepak.h | 10 | ||||
-rw-r--r-- | video/codecs/indeo3.cpp | 4 | ||||
-rw-r--r-- | video/codecs/mjpeg.cpp | 8 | ||||
-rw-r--r-- | video/codecs/mjpeg.h | 12 | ||||
-rw-r--r-- | video/codecs/msrle.cpp | 1 | ||||
-rw-r--r-- | video/codecs/msvideo1.cpp | 1 | ||||
-rw-r--r-- | video/codecs/qdm2.cpp | 3 | ||||
-rw-r--r-- | video/codecs/qdm2.h | 4 | ||||
-rw-r--r-- | video/codecs/qtrle.cpp | 2 | ||||
-rw-r--r-- | video/codecs/rpza.cpp | 2 | ||||
-rw-r--r-- | video/codecs/smc.cpp | 1 | ||||
-rw-r--r-- | video/codecs/truemotion1.cpp | 2 | ||||
-rw-r--r-- | video/coktel_decoder.cpp | 7 | ||||
-rw-r--r-- | video/coktel_decoder.h | 15 | ||||
-rw-r--r-- | video/dxa_decoder.cpp | 5 | ||||
-rw-r--r-- | video/dxa_decoder.h | 10 | ||||
-rw-r--r-- | video/flic_decoder.cpp | 5 | ||||
-rw-r--r-- | video/flic_decoder.h | 7 | ||||
-rw-r--r-- | video/mpeg_player.h | 2 | ||||
-rw-r--r-- | video/qt_decoder.cpp | 14 | ||||
-rw-r--r-- | video/qt_decoder.h | 20 | ||||
-rw-r--r-- | video/smk_decoder.cpp | 2 | ||||
-rw-r--r-- | video/smk_decoder.h | 9 | ||||
-rw-r--r-- | video/video_decoder.cpp | 3 | ||||
-rw-r--r-- | video/video_decoder.h | 15 |
29 files changed, 163 insertions, 43 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index 715741f41d..47322c86b7 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -23,10 +23,9 @@ * */ -#include "common/endian.h" -#include "common/file.h" #include "common/stream.h" -#include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" #include "audio/audiostream.h" #include "audio/mixer.h" @@ -407,7 +406,7 @@ Codec *AviDecoder::createCodec() { case ID_IV32: return new Indeo3Decoder(_bmInfo.width, _bmInfo.height); #endif -#ifdef GRAPHICS_TRUEMOTION1_H +#ifdef VIDEO_CODECS_TRUEMOTION1_H case ID_DUCK: return new TrueMotion1Decoder(_bmInfo.width, _bmInfo.height); #endif diff --git a/video/avi_decoder.h b/video/avi_decoder.h index 33189910c7..0154b57ea6 100644 --- a/video/avi_decoder.h +++ b/video/avi_decoder.h @@ -26,13 +26,34 @@ #ifndef VIDEO_AVI_PLAYER_H #define VIDEO_AVI_PLAYER_H +#include "common/endian.h" +#include "common/rational.h" +#include "common/rect.h" +#include "common/str.h" + #include "video/video_decoder.h" -#include "video/codecs/codec.h" -#include "audio/audiostream.h" #include "audio/mixer.h" +namespace Audio { +class QueuingAudioStream; +} + +namespace Common { +class SeekableReadStream; +} + +namespace Graphics { +struct PixelFormat; +} + +namespace Graphics { +struct Surface; +} + namespace Video { +class Codec; + #define UNKNOWN_HEADER(a) error("Unknown header found -- \'%s\'", tag2str(a)) // IDs used throughout the AVI files diff --git a/video/codecs/cdtoons.cpp b/video/codecs/cdtoons.cpp index 2d7920fb18..51e3c23eaa 100644 --- a/video/codecs/cdtoons.cpp +++ b/video/codecs/cdtoons.cpp @@ -24,9 +24,9 @@ */ #include "video/codecs/cdtoons.h" +#include "common/rect.h" #include "common/stream.h" - -#include "common/system.h" +#include "common/textconsole.h" namespace Video { diff --git a/video/codecs/cinepak.cpp b/video/codecs/cinepak.cpp index 28fcd67a03..2a782dbafe 100644 --- a/video/codecs/cinepak.cpp +++ b/video/codecs/cinepak.cpp @@ -25,7 +25,13 @@ #include "video/codecs/cinepak.h" +#include "common/debug.h" +#include "common/stream.h" #include "common/system.h" +#include "common/textconsole.h" +#include "common/util.h" + +#include "graphics/surface.h" // Code here partially based off of ffmpeg ;) diff --git a/video/codecs/cinepak.h b/video/codecs/cinepak.h index 8b4c0216a3..34e4fe98eb 100644 --- a/video/codecs/cinepak.h +++ b/video/codecs/cinepak.h @@ -27,13 +27,19 @@ #define VIDEO_CODECS_CINEPAK_H #include "common/scummsys.h" -#include "common/stream.h" #include "common/rect.h" -#include "graphics/surface.h" #include "graphics/pixelformat.h" #include "video/codecs/codec.h" +namespace Common { +class SeekableReadStream; +} + +namespace Graphics { +struct Surface; +} + namespace Video { struct CinepakCodebook { diff --git a/video/codecs/indeo3.cpp b/video/codecs/indeo3.cpp index 742b30243f..b4f6c6ffe3 100644 --- a/video/codecs/indeo3.cpp +++ b/video/codecs/indeo3.cpp @@ -35,8 +35,8 @@ #include "common/system.h" #include "common/endian.h" -#include "common/frac.h" -#include "common/file.h" +#include "common/stream.h" +#include "common/textconsole.h" #include "graphics/conversion.h" diff --git a/video/codecs/mjpeg.cpp b/video/codecs/mjpeg.cpp index 986b1079d3..2ef854039b 100644 --- a/video/codecs/mjpeg.cpp +++ b/video/codecs/mjpeg.cpp @@ -24,10 +24,16 @@ */ #include "common/system.h" -#include "graphics/conversion.h" // For YUV2RGB +#include "common/textconsole.h" +#include "graphics/jpeg.h" +#include "graphics/surface.h" #include "video/codecs/mjpeg.h" +namespace Common { +class SeekableReadStream; +} + namespace Video { JPEGDecoder::JPEGDecoder() : Codec() { diff --git a/video/codecs/mjpeg.h b/video/codecs/mjpeg.h index c9f931f091..d1395a8248 100644 --- a/video/codecs/mjpeg.h +++ b/video/codecs/mjpeg.h @@ -26,12 +26,18 @@ #ifndef VIDEO_CODECS_MJPEG_H #define VIDEO_CODECS_MJPEG_H -#include "common/scummsys.h" - #include "video/codecs/codec.h" -#include "graphics/jpeg.h" #include "graphics/pixelformat.h" +namespace Common { +class SeekableReadStream; +} + +namespace Graphics { +class JPEG; +struct Surface; +} + namespace Video { // Motion JPEG Decoder diff --git a/video/codecs/msrle.cpp b/video/codecs/msrle.cpp index b750efa6a7..19309bc7aa 100644 --- a/video/codecs/msrle.cpp +++ b/video/codecs/msrle.cpp @@ -27,6 +27,7 @@ #include "video/codecs/msrle.h" #include "common/stream.h" +#include "common/textconsole.h" namespace Video { diff --git a/video/codecs/msvideo1.cpp b/video/codecs/msvideo1.cpp index 16041b5baa..93e9aaae64 100644 --- a/video/codecs/msvideo1.cpp +++ b/video/codecs/msvideo1.cpp @@ -27,6 +27,7 @@ #include "video/codecs/msvideo1.h" #include "common/stream.h" +#include "common/textconsole.h" namespace Video { diff --git a/video/codecs/qdm2.cpp b/video/codecs/qdm2.cpp index 61e59c8aba..8126b57a95 100644 --- a/video/codecs/qdm2.cpp +++ b/video/codecs/qdm2.cpp @@ -34,8 +34,9 @@ #include "video/codecs/qdm2data.h" #include "common/array.h" +#include "common/debug.h" #include "common/stream.h" -#include "common/system.h" +#include "common/textconsole.h" namespace Video { diff --git a/video/codecs/qdm2.h b/video/codecs/qdm2.h index a6acf3a83e..b224e801a6 100644 --- a/video/codecs/qdm2.h +++ b/video/codecs/qdm2.h @@ -30,11 +30,11 @@ #define VIDEO_CODECS_QDM2_H namespace Common { - class SeekableReadStream; +class SeekableReadStream; } namespace Audio { - class AudioStream; +class AudioStream; } namespace Video { diff --git a/video/codecs/qtrle.cpp b/video/codecs/qtrle.cpp index 78267cc56e..0ae27f6284 100644 --- a/video/codecs/qtrle.cpp +++ b/video/codecs/qtrle.cpp @@ -28,9 +28,11 @@ #include "video/codecs/qtrle.h" +#include "common/debug.h" #include "common/scummsys.h" #include "common/stream.h" #include "common/system.h" +#include "common/textconsole.h" #include "graphics/colormasks.h" #include "graphics/surface.h" diff --git a/video/codecs/rpza.cpp b/video/codecs/rpza.cpp index c3a983004c..0c06661c50 100644 --- a/video/codecs/rpza.cpp +++ b/video/codecs/rpza.cpp @@ -27,8 +27,10 @@ #include "video/codecs/rpza.h" +#include "common/debug.h" #include "common/system.h" #include "common/stream.h" +#include "common/textconsole.h" #include "graphics/colormasks.h" namespace Video { diff --git a/video/codecs/smc.cpp b/video/codecs/smc.cpp index 2b45a67360..bbd6073497 100644 --- a/video/codecs/smc.cpp +++ b/video/codecs/smc.cpp @@ -27,6 +27,7 @@ #include "video/codecs/smc.h" #include "common/stream.h" +#include "common/textconsole.h" namespace Video { diff --git a/video/codecs/truemotion1.cpp b/video/codecs/truemotion1.cpp index 00c15871a2..70c456d4a8 100644 --- a/video/codecs/truemotion1.cpp +++ b/video/codecs/truemotion1.cpp @@ -32,6 +32,8 @@ #include "video/codecs/truemotion1data.h" #include "common/stream.h" +#include "common/textconsole.h" +#include "common/util.h" namespace Video { diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp index b68e10b2c3..4448c9162e 100644 --- a/video/coktel_decoder.cpp +++ b/video/coktel_decoder.cpp @@ -24,6 +24,13 @@ */ #include "common/scummsys.h" +#include "common/rect.h" +#include "common/endian.h" +#include "common/stream.h" +#include "common/system.h" +#include "common/textconsole.h" +#include "common/types.h" +#include "common/util.h" #include "video/coktel_decoder.h" diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h index e83e1d29ed..46007d55da 100644 --- a/video/coktel_decoder.h +++ b/video/coktel_decoder.h @@ -35,14 +35,25 @@ #include "common/list.h" #include "common/array.h" -#include "common/rect.h" +#include "common/rational.h" +#include "common/str.h" + +#include "graphics/surface.h" #include "video/video_decoder.h" #include "audio/mixer.h" +namespace Common { +struct Rect; +class SeekableReadStream; +} namespace Audio { - class QueuingAudioStream; +class QueuingAudioStream; +} + +namespace Graphics { +struct PixelFormat; } namespace Video { diff --git a/video/dxa_decoder.cpp b/video/dxa_decoder.cpp index 2e864fd3d6..9e3f59705c 100644 --- a/video/dxa_decoder.cpp +++ b/video/dxa_decoder.cpp @@ -25,10 +25,11 @@ #include "common/debug.h" #include "common/endian.h" -#include "common/archive.h" #include "common/system.h" #include "common/stream.h" -#include "common/util.h" +#include "common/textconsole.h" + +#include "graphics/surface.h" #include "video/dxa_decoder.h" diff --git a/video/dxa_decoder.h b/video/dxa_decoder.h index 614cb2d90b..498f4630d4 100644 --- a/video/dxa_decoder.h +++ b/video/dxa_decoder.h @@ -26,8 +26,18 @@ #ifndef VIDEO_DXA_DECODER_H #define VIDEO_DXA_DECODER_H +#include "common/rational.h" +#include "graphics/pixelformat.h" #include "video/video_decoder.h" +namespace Common { +class SeekableReadStream; +} + +namespace Graphics { +struct Surface; +} + namespace Video { /** diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp index 38e82906ba..47a9244a13 100644 --- a/video/flic_decoder.cpp +++ b/video/flic_decoder.cpp @@ -24,10 +24,11 @@ */ #include "video/flic_decoder.h" -#include "common/archive.h" -#include "common/stream.h" #include "common/endian.h" +#include "common/rect.h" +#include "common/stream.h" #include "common/system.h" +#include "common/textconsole.h" namespace Video { diff --git a/video/flic_decoder.h b/video/flic_decoder.h index 954fed7bfa..42e7863fc6 100644 --- a/video/flic_decoder.h +++ b/video/flic_decoder.h @@ -28,10 +28,13 @@ #include "video/video_decoder.h" #include "common/list.h" -#include "common/rect.h" +#include "common/rational.h" +#include "graphics/pixelformat.h" +#include "graphics/surface.h" namespace Common { - class SeekableReadStream; +struct Rect; +class SeekableReadStream; } namespace Video { diff --git a/video/mpeg_player.h b/video/mpeg_player.h index 44baff9c2b..dde272a9c6 100644 --- a/video/mpeg_player.h +++ b/video/mpeg_player.h @@ -81,7 +81,7 @@ typedef sequence_t mpeg2_sequence_t; #define BUFFER_SIZE 4096 namespace Common { - class File; +class File; } class OSystem; diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index 24225ece89..d455b13b64 100644 --- a/video/qt_decoder.cpp +++ b/video/qt_decoder.cpp @@ -39,20 +39,32 @@ #include "common/memstream.h" #include "common/util.h" #include "common/zlib.h" +#include "common/stream.h" +#include "common/system.h" +#include "common/textconsole.h" +#include "common/types.h" + +#include "graphics/pixelformat.h" +#include "graphics/surface.h" + + +#include "audio/audiostream.h" // Audio codecs #include "audio/decoders/adpcm.h" #include "audio/decoders/raw.h" -#include "video/codecs/qdm2.h" // Video codecs +#include "video/codecs/codec.h" #include "video/codecs/cinepak.h" #include "video/codecs/mjpeg.h" +#include "video/codecs/qdm2.h" #include "video/codecs/qtrle.h" #include "video/codecs/rpza.h" #include "video/codecs/smc.h" #include "video/codecs/cdtoons.h" + namespace Video { //////////////////////////////////////////// diff --git a/video/qt_decoder.h b/video/qt_decoder.h index f11689e021..624134a26a 100644 --- a/video/qt_decoder.h +++ b/video/qt_decoder.h @@ -35,22 +35,32 @@ #define VIDEO_QT_DECODER_H #include "common/scummsys.h" -#include "common/queue.h" #include "common/rational.h" #include "video/video_decoder.h" -#include "video/codecs/codec.h" -#include "audio/audiostream.h" #include "audio/mixer.h" +#include "audio/timestamp.h" namespace Common { - class File; - class MacResManager; +class MacResManager; +class SeekableReadStream; +} + +namespace Audio { +class AudioStream; +class QueuingAudioStream; +} + +namespace Graphics { +struct PixelFormat; +struct Surface; } namespace Video { +class Codec; + /** * Decoder for QuickTime videos. * diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp index 6e82b0ede9..7a95eedf6a 100644 --- a/video/smk_decoder.cpp +++ b/video/smk_decoder.cpp @@ -29,11 +29,11 @@ #include "video/smk_decoder.h" -#include "common/archive.h" #include "common/endian.h" #include "common/util.h" #include "common/stream.h" #include "common/system.h" +#include "common/textconsole.h" #include "audio/audiostream.h" #include "audio/mixer.h" diff --git a/video/smk_decoder.h b/video/smk_decoder.h index 2d01909a44..b4eda88203 100644 --- a/video/smk_decoder.h +++ b/video/smk_decoder.h @@ -26,11 +26,18 @@ #ifndef VIDEO_SMK_PLAYER_H #define VIDEO_SMK_PLAYER_H +#include "common/rational.h" +#include "graphics/pixelformat.h" +#include "graphics/surface.h" #include "video/video_decoder.h" #include "audio/mixer.h" namespace Audio { - class QueuingAudioStream; +class QueuingAudioStream; +} + +namespace Common { +class SeekableReadStream; } namespace Video { diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp index a6317bac8f..dde2c09082 100644 --- a/video/video_decoder.cpp +++ b/video/video_decoder.cpp @@ -25,9 +25,12 @@ #include "video/video_decoder.h" +#include "common/rational.h" #include "common/file.h" #include "common/system.h" +#include "graphics/palette.h" + namespace Video { VideoDecoder::VideoDecoder() { diff --git a/video/video_decoder.h b/video/video_decoder.h index 348b5dc0a3..b5574fd3fc 100644 --- a/video/video_decoder.h +++ b/video/video_decoder.h @@ -26,18 +26,19 @@ #ifndef VIDEO_DECODER_H #define VIDEO_DECODER_H -#include "common/events.h" -#include "common/list.h" -#include "common/rational.h" - -#include "graphics/surface.h" -#include "graphics/pixelformat.h" +#include "common/str.h" #include "audio/timestamp.h" // TODO: Move this to common/ ? namespace Common { - class SeekableReadStream; +class Rational; +class SeekableReadStream; +} + +namespace Graphics { +struct PixelFormat; +struct Surface; } namespace Video { |