Commit Graph

62 Commits

Author SHA1 Message Date
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
Matthew Hoops
547fd1bdca COMMON: Cleanup QuickTime variable and struct naming 2011-06-03 00:58:29 -04:00
Matthew Hoops
2e06681698 COMMON: Begin objectifying QuickTimeParser::SampleDesc further
This is preparation for multiple video and audio tracks
2011-06-02 23:44:40 -04:00
Max Horn
9db33ea544 ALL: Removed last traces of the MPEG2 code 2011-06-01 23:17:43 +02:00
Matthew Hoops
aa49b38c5a Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	engines/groovie/script.cpp
2011-05-31 14:16:29 -04:00
Max Horn
717a7accf5 BUILD: Always enable indeo3 codec 2011-05-25 13:24:37 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Matthew Hoops
a1d41da096 Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h
2011-05-11 00:30:28 -04:00
Max Horn
89f40bc02a VIDEO: Cleanup mixed array / type declaration 2011-05-03 13:25:01 +02:00
Ori Avtalion
a896125ee4 VIDEO: Fix flic decoder not including rect.h which is used inline 2011-05-01 18:48:42 +03:00
Johannes Schickel
71bdb86e02 Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".
For further discussion check here:
https://github.com/scummvm/scummvm/pull/16

Conflicts:
	graphics/png.cpp
2011-05-01 16:54:45 +02:00
Ori Avtalion
c46e4a47f2 VIDEO: Fix compilation on SCUMM_BIG_ENDIAN backends 2011-04-28 20:00:19 +03:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Ori Avtalion
845db59e08 VIDEO: Fix incorrect, renamed, guard for TrueMotion1 support 2011-04-28 14:05:45 +03:00
Ori Avtalion
cd6ee0589d JANITORIAL: Format forward declarations to follow convention 2011-04-28 12:20:34 +03:00
Johannes Schickel
79ed190523 VIDEO: Set up the pixel format for the TrueMotion1 codec properly. 2011-04-17 22:09:55 +02:00
Johannes Schickel
da734a4af0 ALL/GRAPHICS: Remove Surface::bytesPerPixel. 2011-04-17 21:27:34 +02:00
Johannes Schickel
f90bbf9cfa VIDEO: Prefer Surface::format over Surface::bytesPerPixel. 2011-04-17 20:55:49 +02:00
Johannes Schickel
5e279996eb VIDEO: Prefer Surface::create taking a PixelFormat over the one taking a byte depth.
Certain codecs seem to use a Surface with Bpp 2, but do not have any proper
format description. Whoever is maintaining these should check this commit and
fix the format properly.
2011-04-17 16:35:12 +02:00
Matthew Hoops
3f124ae6bb VIDEO: Fix QuickTime videos without a video stream
Just in case anyone uses just that instead of Audio::makeQuickTimeStream()...
2011-04-14 10:31:20 -04:00
Matthew Hoops
76105b29b7 AUDIO: Split the QuickTimeAudioDecoder into a new header file
(Mirroring the new adpcm_intern.h file)
2011-04-14 10:25:02 -04:00
Max Horn
84184aabc0 ALL: colour -> color 2011-04-14 14:12:35 +02:00
Matthew Hoops
6d153f311c Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	video/qt_decoder.cpp
2011-04-13 16:04:29 -04:00
Max Horn
8f70e089ac VIDEO: Use shared ADPCM data tables in VMDDecoder 2011-04-13 12:48:58 +02:00
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
2011-04-12 16:53:15 +02:00
Matthew Hoops
faee277978 COMMON: Add a DisposeAfterUse flag to QuickTimeParser 2011-04-08 17:04:29 -04:00
Matthew Hoops
88ebf13077 AUDIO: Allow for seeking in a QuickTimeAudioStream 2011-04-08 10:54:13 -04:00
Matthew Hoops
8cf73e3fb4 AUDIO: Split QuickTime audio into a new class
Standalone QuickTime files can now be played as an AudioStream
2011-04-07 19:40:07 -04:00
Matthew Hoops
d718755d73 VIDEO: Cleanup
The VideoDecoder interface to the QuickTimeParser uses almost entirely ScummVM code now, with only trace amounts remaining from FFmpeg.
2011-04-07 00:47:29 -04:00
Matthew Hoops
db71efd94f VIDEO: Split the QuickTime parser from the QuickTime VideoDecoder 2011-04-07 00:21:48 -04:00
Matthew Hoops
b71d2038ae VIDEO: Begin splitting video-specific QuickTime sample description code 2011-04-06 23:06:44 -04:00
Matthew Hoops
82a417b40c VIDEO: Fix broken for statement 2011-04-06 22:21:49 -04:00
Matthew Hoops
d7dfbd4b78 VIDEO: Allow MPEG-4 containers to be parsed 2011-04-06 22:15:36 -04:00
dhewg
d83a83ef50 JANITORIAL: Remove/comment unused vars
Found by GCC 4.6's -Wunused-but-set-variable
2011-03-29 21:57:56 +02:00
Sven Hesse
97966c36e1 VIDEO: Add a workaround for the Inca 2 wisdom gate video
When decompressing directly onto the output surface fails (because
it's too small), retry decompressing into the video buffer first,
which then gets blitted onto the output surface.
2011-03-29 12:47:20 +02:00
Sven Hesse
8291732c94 VIDEO: Fix deLZ77() bound check
The Inca 2 video where Atahualpa walks through the gate after
solving the wisdom challenge now only warns (and graphically
glitches) instead of segfaulting.
2011-03-29 12:39:51 +02:00
Matthew Hoops
94c27e4657 VIDEO: Add a getDuration() function to SeekableVideoDecoder
This function returns the total duration of the video
2011-03-21 18:27:10 -04:00
md5
19d3972f16 VIDEO: Changed several places that use PI to use M_PI instead 2011-03-19 02:29:22 +02:00
Johannes Schickel
a02454644a Merge branch 'master' into osystem-palette
Conflicts:
	backends/platform/wii/osystem_gfx.cpp
2011-02-15 23:42:50 +01:00
Johannes Schickel
3b9da7f03b VIDEO: Adapt VideoDecoder::setSystemPalette to setPalette RGBA->RGB change. 2011-02-15 22:16:59 +01:00
Matthew Hoops
ea67956768 VIDEO: Add some stubs for QuickTime edit list work
The edit lists are actually read in now. Minor cleanup of streams as well.
2011-02-15 11:01:43 -05:00
Matthew Hoops
191d216785 VIDEO: Add another AVI stream type used by Indeo3
svn-id: r55886
2011-02-11 21:46:28 +00:00
Matthew Hoops
0544977daa VIDEO: Fix QDM2 audio
A regression from r55474

svn-id: r55882
2011-02-11 15:02:15 +00:00
Matthew Hoops
61c33feaba VIDEO: Fix QuickTime audio seeking
svn-id: r55877
2011-02-11 04:23:38 +00:00
Sylvain Dupont
247e882711 VIDEO: Added some skipping when bad data is found in Indeo3
Some Urban Runner videos are badly encoded and contain
corrupted data. When the decoder realizes that there is 
some bad data, it skips the rest of the frame.
The original Indeo3 DLL decoder does the same.

svn-id: r55876
2011-02-10 21:41:59 +00:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +00:00
Max Horn
d7370f11e4 VIDEO: Remove unused SeekableVideoDecoder::seekToFrame method
svn-id: r55844
2011-02-09 00:14:06 +00:00
Max Horn
805a5b2996 VIDEO: In overloaded methods, invoke correct parent implementation
This should not cause any code behavior changes at this time, but if any
of the intermediate VideoDecoder classes ever starts to overload stuff,
this would become important.

svn-id: r55841
2011-02-09 00:12:58 +00:00
Johannes Schickel
9cf8d4d548 VIDEO: Fix the documentation of VideoDecoder::setSystemPalette.
svn-id: r55836
2011-02-08 23:00:28 +00:00
Johannes Schickel
949000a144 VIDEO: Fix the documentation of VideoDecoder::getPalette.
svn-id: r55835
2011-02-08 22:58:34 +00:00