Commit Graph

146 Commits

Author SHA1 Message Date
Ori Avtalion
757f787a27 VIDEO: Ignore requests to unpause when video is already unpaused
Previous behavior was to assert

svn-id: r51517
2010-07-30 21:07:27 +00:00
Matthew Hoops
8e705bb2e2 VIDEO: Fix FLIC looping
Thanks to salty-horse for finding this. Also, use Common::Rational directly to hold the frame rate to avoid rounding.

svn-id: r51516
2010-07-30 20:35:09 +00:00
Johannes Schickel
e5e94d4511 Strip trailing whitespaces in our common code base.
svn-id: r51094
2010-07-21 18:17:51 +00:00
Max Horn
0b48a71c99 Remove PalmOS port
svn-id: r50964
2010-07-17 18:41:38 +00:00
Matthew Hoops
d5ff65bc02 Fix valgrind warning.
svn-id: r50873
2010-07-14 05:04:55 +00:00
Torbjörn Andersson
f10b1a23f8 Fixed a few cppcheck errors.
svn-id: r49919
2010-06-17 05:40:48 +00:00
David Turner
408bfa2098 Fixed QDM2 to working state.
Major issue was that the input frames are reused 16 times to produce output frames.
Thanks to clone2727 for helping with this.

svn-id: r49900
2010-06-16 04:47:18 +00:00
Max Horn
651e2760a3 Fix spelling, cleanup
svn-id: r49843
2010-06-15 12:33:20 +00:00
Matthew Hoops
2138fe0d5a Fix our interpretation of the audio compression types to what FFmpeg currently does. Should fix bug #3009282.
svn-id: r49362
2010-05-31 21:29:43 +00:00
Matthew Hoops
2a0f91444f Ignore v2 compressed audio chunks instead of treating them as Huffman DPCM. Should fix playback of at least the video portion of those videos (found in later Broken Sword releases).
svn-id: r49340
2010-05-31 01:27:57 +00:00
Matthew Hoops
b0366e65e5 Cleanup AVI a bit, add support for stereo audio
svn-id: r49279
2010-05-27 23:57:44 +00:00
Matthew Hoops
017507ffa6 Take any 'moov' resource from a resource fork, not just 0x80; minor cleanup.
svn-id: r49245
2010-05-26 15:42:26 +00:00
Filippos Karapetis
14fae8db03 Proper fix for the MSVC warning concerning packing: reordered the members of the ParseTable struct and removed the struct packing pragmas
svn-id: r49235
2010-05-26 11:56:58 +00:00
Filippos Karapetis
ad9772fac6 Properly fixed MSVC warning C4121 (alignment of a member was sensitive to packing)
svn-id: r49226
2010-05-26 06:45:57 +00:00
Matthew Hoops
cd5e90f298 Implement QuickTime playback for SCI1.1 Mac. The 'Halfdome' and 'KQ6Movie' videos now play. However, they require multiple edit list support to look completely correct.
svn-id: r49224
2010-05-26 03:43:21 +00:00
Matthew Hoops
ab540af9f8 Fix a regression with rewinding in QuickTime videos (looping works in Riven again) and some minor cleanup.
svn-id: r49206
2010-05-25 02:35:50 +00:00
Matthew Hoops
8f14c15b1a Add support for loading the QuickTime 'moov' atom from the file's resource fork, needed for SCI Mac.
svn-id: r49172
2010-05-23 23:26:28 +00:00
Matthew Hoops
b3bd797e01 Move the QDM2 code to the graphics module, removing the cyclic dependency.
svn-id: r49171
2010-05-23 21:41:13 +00:00
Matthew Hoops
5e90f66edc Hide the QDM2 implementation and only expose it via a factory method, hopefully fixing compilation on most systems at the same time.
svn-id: r49170
2010-05-23 19:54:17 +00:00
Eugene Sandulenko
ed0e8182ce FFMpeg switched to Git, so update link to original smacker decoder.
svn-id: r49166
2010-05-23 19:08:31 +00:00
Matthew Hoops
2f31b05651 Move Mohawk's QuickTime code to graphics/ (and QDM2 to sound, disabled when Mohawk is not enabled) so SCI can use the code.
svn-id: r49165
2010-05-23 18:33:55 +00:00
Matthew Hoops
2e0fdda51f Add a pause level system to VideoDecoder (blatantly ripped off from Engine) and adapt Mohawk to it.
svn-id: r49120
2010-05-20 18:38:06 +00:00
Matthew Hoops
759e4923d0 Add a new class 'RewindableVideoDecoder' that allows a video to be rewound and have QTPlayer inherit from that.
svn-id: r49084
2010-05-18 17:36:34 +00:00
Matthew Hoops
11cbdd0318 Committing the rest of the VideoDecoder Rewrite from patch #2963496.
svn-id: r49079
2010-05-18 14:17:24 +00:00
Ori Avtalion
7ab8f6e25b Fix currentFrame semantics in Flic player
svn-id: r49073
2010-05-18 10:01:31 +00:00
Matthew Hoops
c7fa1074fb Change VideoDecoder::getCurFrame() to mean the last frame drawn instead of the next frame to draw. This is patch 1 from patch #2963496 (VideoDecoder Rewrite).
svn-id: r49063
2010-05-17 21:59:05 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
2010-04-12 09:14:17 +00:00
Sven Hesse
a1f1cdf820 Changing Imd::renderFrame() and Vmd::renderFrame() to properly clip the drawing area to prevent overdrawing without producing garbage output
svn-id: r48264
2010-03-15 22:24:11 +00:00
Sven Hesse
a9b7722df3 The frame coordinate cropping for IMDs is wrong, and should be unnecessary anyway, since Imd::renderFrame() should already check for overblitting. This fixes bug #2969904 ("GOB3: Graphical Glitch in finished cutscene")
svn-id: r48262
2010-03-15 17:44:59 +00:00
Sven Hesse
5886a0cc77 Removing a debug warning() and adding some comments
svn-id: r48236
2010-03-11 19:47:59 +00:00
Sven Hesse
31f980ffde Adding support for the very primitive and simply early IMD format used in Fascination
svn-id: r48233
2010-03-11 06:14:52 +00:00
Max Horn
9fb27a26f8 Remove unnecessary #includes
svn-id: r48185
2010-03-08 10:28:14 +00:00
Arnaud Boutonné
aaa5849567 Revert r47944: useless debug messages, sorry for the wrong commit
svn-id: r47946
2010-02-06 22:54:20 +00:00
Arnaud Boutonné
ceba3a6ce9 Add an assert to avoid a crash when printing the character 0x00.
svn-id: r47944
2010-02-06 22:47:13 +00:00
Matthew Hoops
969a048619 Silence a valgrind warning. The sound buffer should be created with malloc and not new[].
svn-id: r47896
2010-02-05 04:27:51 +00:00
Matthew Hoops
19d3f5ad9b Have SCI look through the patches directory (except in KQ6 where the patches in that directory are broken) to fix some GK1 Windows problems. Add the MSRLE codec to AVI (from DrMcCoy's Dark Seed II engine, with permission). GK1 Windows now will play the credits video.
svn-id: r47894
2010-02-05 03:29:04 +00:00
Max Horn
1565f14bc1 Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/
svn-id: r47579
2010-01-26 22:48:45 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Torbjörn Andersson
4818467908 Silenced some more cppcheck warnings. Some of these may seem silly, but the way
I figure it the changes are harmless at worst, and making them will make it
easier to find real errors in the (still quite long) list of warnings.

svn-id: r47443
2010-01-22 19:05:02 +00:00
Max Horn
dc5e08e623 Move raw audio flags from sound/mixer.h to sound/raw.h
svn-id: r47395
2010-01-19 22:30:33 +00:00
Max Horn
557bb394de Get rid of Mixer::FLAG_AUTOFREE.
Also fix several recently introduced new/delete vs. malloc/free mismatches.

svn-id: r47369
2010-01-19 00:56:29 +00:00
Max Horn
a44c6e4323 Add Mixer::getElapsedTime() method returning a Timestamp, thus offering a higher precision than Mixer::getSoundElapsedTime(). Convert some video code to use it.
svn-id: r47213
2010-01-09 22:37:10 +00:00
Sven Hesse
30e360f5c5 Yup, not checking for stereo sound was an accident here
svn-id: r47195
2010-01-09 03:55:09 +00:00
Max Horn
0cf53b025d Move DisposeAfterUse::Flag from Common to global namespace, and into a new header common/types.h
svn-id: r47180
2010-01-08 22:07:35 +00:00
Max Horn
474d49946f Rename QueuedAudioStream to QueuingAudioStream
svn-id: r47179
2010-01-08 22:06:04 +00:00
Max Horn
7efba85064 Switch Tinsel, MADE and some of the video players to QueuedAudioStream
svn-id: r47178
2010-01-08 22:05:12 +00:00
Filippos Karapetis
bcc33871c1 The wrapper for the VMD decoder is only used in the SCI engine for SCI32 games, so moved it inside the engine, instead of common code. Added support for VMD video playing from the "play_video" console command
svn-id: r46737
2009-12-30 10:09:48 +00:00
Eugene Sandulenko
5f1d2a88b5 Fix warning
svn-id: r46726
2009-12-29 23:13:30 +00:00
Filippos Karapetis
14d4b75afb Added a thin wrapper around the VMD player class, so that it can be used with the common VideoPlayer interface, to be used with videos from SCI32 games
svn-id: r46715
2009-12-29 19:42:26 +00:00
Sven Hesse
10e62ea992 Adding a getFrameWaitTime() method to get the frame waiting time instead of directly waiting
svn-id: r46712
2009-12-29 18:07:06 +00:00