69 Commits

Author SHA1 Message Date
Paweł Kołodziejski
9131adfde1 fixed compile warnings 2012-01-27 14:12:15 +01:00
Joel Teichroeb
2649620a9b GRIM: Fix some small memory leaks 2012-01-25 20:35:58 -08:00
Einar Johan Trøan Sømåen
dc33b8282f Merge pull request #498 from klusark/gfxswitch
GRIM: Add support for live switching of gfx engines
2012-01-24 12:25:40 -08:00
Matthew Hoops
fb30462d43 GRIM: Fix EMI Bink videos with the 'SMUSH' header 2012-01-22 16:34:56 +01:00
Joel Teichroeb
acdd0e223f GRIM: Add support for live switching of gfx engines 2012-01-21 20:18:35 -08:00
Paweł Kołodziejski
4c43826d49 fix compilation 2012-01-17 16:07:37 +01:00
Joel Teichroeb
6b2e1ad646 GRIM: Set _stream to null after it is done with. Fixes #466 2012-01-11 18:52:09 -08:00
Joel Teichroeb
efd6c7bd78 GRIM: Wrap file streams in a compressed read stream whenever needed 2012-01-09 19:24:00 -08:00
Paweł Kołodziejski
e350c7f777 renames 2012-01-06 23:29:45 +01:00
Pawe Koodziejski
a5479cfe83 sync with scummvm 2012-01-06 22:56:21 +01:00
Einar Johan T. Sømåen
f81fa58a5f GRIM: Quickfix to mpeg-code to fix compile
MPEG still isn't testable with EMI-PS2, but
this should at the very least make it possible
to compile with the --enable-mpeg2 flag enabled.

Fixes #451
2012-01-02 13:35:44 +01:00
Andrea Corna
c05e50feef GRIM: Cleaned Lab access and rebased it on Common::Archive 2011-12-30 17:09:29 +01:00
Giulio Camuffo
e271b8772e GRIM/MOVIE: Actually draw the last frame of a looping smush movie.
This won't work on Bink movies as is. If it will be needed on those too
a different implementation will have to be found.
2011-12-18 17:45:09 +01:00
Giulio Camuffo
1fd4b5268a GRIM/MOVIE: Keep an always running callback timer, avoiding risks of deadlock.
Should fix probably #430
2011-12-18 00:14:53 +01:00
Giulio Camuffo
879fbd6855 GRIM/MOVIE: Draw also the last frame.
_curFrame represents the frame that is being displayed, not the
frame that is to be processed.
2011-12-16 18:05:23 +01:00
Giulio Camuffo
54e3b584fa GRIM/MOVIE: Process the first frame of the movie immediately. 2011-12-12 17:12:26 +01:00
Giulio Camuffo
35fade48b6 GRIM/MOVIE: Fix movie playback on AmigaOS. Fix #382 2011-12-07 18:34:56 +01:00
Giulio Camuffo
1a559986c1 GRIM/MOVIE: Don't try to restore a movie when there isn't any to restore. 2011-12-01 18:59:14 +01:00
Einar Johan T. Sømåen
bbf3b763df GRIM: Make NullPlayer work properly with new MoviePlayer-superclass fixes #395 2011-10-30 18:44:34 +01:00
Giulio Camuffo
7b1f87f928 GRIM: Boost of the debug system, using debug channels. 2011-10-10 18:17:22 +02:00
Giulio Camuffo
8f451e1f11 GRIM/Movie: Copy the surface when requested only. 2011-10-07 22:37:12 +02:00
Giulio Camuffo
150dadadd8 GRIM/Smush: Don't try to seek the movie if it isn't running on restore. 2011-10-07 12:41:31 +02:00
Giulio Camuffo
03cba02547 GRIM/Smush: Frames start from 0 now. Reset the frame when at end if looping. 2011-10-05 19:06:18 +02:00
Giulio Camuffo
d6941173df GRIM: Use an enum for the engine modes instead of the #defines. 2011-10-04 22:01:24 +02:00
somaen
4bddcfadac Merge pull request #376 from somaen/smush_decoder
Refactor the SMUSH-decoder into a subclass of VideoDecoder
2011-10-03 08:46:33 -07:00
Einar Johan T. Sømåen
007f404c5c GRIM: Actually remember to add vima.h this time around 2011-10-03 15:29:46 +02:00
Einar Johan T. Sømåen
8e8a2f92ca GRIM: Add vima.h to avoid having to include grim.h, and to possibly isolate imuse/movie from the rest of the code 2011-10-03 01:54:01 +02:00
Einar Johan T. Sømåen
dd125b57a2 GRIM: Cleanup in MPEG2-code, so it atleast compiles, will need further work to actually work though 2011-10-02 00:22:09 +02:00
Einar Johan T. Sømåen
abea6d10fb GRIM: Reduce dependencies on engines/grim in engines/grim/movie 2011-10-02 00:21:21 +02:00
Einar Johan T. Sømåen
ceb42b40e0 GRIM: Cleanup in Movie-code 2011-10-01 22:42:38 +02:00
Einar Johan T. Sømåen
c34dae8eff GRIM: Change DEBUG_SMUSH to DEBUG_MOVIE 2011-10-01 02:56:54 +02:00
Einar Johan T. Sømåen
5e93a6f9b1 GRIM: Refactor the smush-decoder into a subclass of VideoDecoder 2011-10-01 02:51:55 +02:00
Giulio Camuffo
a14567d305 GRIM: Codestyle. 2011-09-07 16:30:58 +02:00
Matthieu Milan
bc08a2b880 GRIM: fix compilation errors due to pull request #340 2011-09-07 11:37:09 +02:00
Josh Matthews
d4d2cb1494 GRIM: Move SMUSH audio pausing into generic movie backend. 2011-09-06 11:13:21 -04:00
Josh Matthews
452b3efde5 GRIM: Pause current wave frame along with SMUSH movie. 2011-09-05 23:46:15 -04:00
Pawel Kolodziejski
049e29d42d Merge pull request #338 from YakBizzarro/smush-speed
SMUSH: Set the speed to an hardcoded value for normal movies, reads from the video file for looping movies.
2011-08-30 03:31:18 -07:00
Giulio Camuffo
707ff45db1 GRIM: Use StackLock instead of Mutex directly. 2011-08-23 14:34:00 +02:00
Giulio Camuffo
cfbfe00f46 GRIM: Use a mutex to make sure smush runs only one frame at a time. 2011-08-23 12:24:03 +02:00
Giulio Camuffo
6803acbf8d GRIM: Create _startPos when playing a smuch movie. 2011-08-22 15:03:06 +02:00
Matthew Hoops
0ab7c1254d GRIM: Fix the EMI demo video 2011-08-15 15:17:23 -04:00
Matthew Hoops
282d3e221c GRIM: Don't assert out when failing to open a video 2011-08-15 15:17:06 -04:00
Andrea Corna
4f72a44018 SMUSH: Set the speed to an hardcoded value for normal movies, reads from the video file for looping movies. 2011-08-14 22:06:33 +02:00
Einar Johan T. Sømåen
8a376c522e GRIM: Make NullPlayer show proper warnings 2011-08-13 11:12:09 +02:00
Einar Johan T. Sømåen
fe521f9b6e GRIM: Remove SMUSH-dependency on <zlib/zlib.h> 2011-08-13 10:18:36 +02:00
Einar Johan T. Sømåen
3902a7c230 GRIM: Make SMUSH-decoder use GZipReadStream instead of rolling its own zlib-decoding 2011-08-13 10:17:17 +02:00
Einar Johan T. Sømåen
aa44589258 GRIM: Add USE_BINK guards 2011-08-13 08:09:49 +02:00
Einar Johan T. Sømåen
c3b69b6afa GRIM: add USE_SMUSH-protection for fixing USE_ZLIB 2011-08-13 07:19:51 +02:00
Pawel Kolodziejski
578cf4ab75 Merge pull request #310 from somaen/emiVideo
EMI: Fixup in video-playback.
2011-08-12 22:02:14 -07:00
Einar Johan T. Sømåen
10d50e4c32 GRIM: Fix drawing to the right surface in Bink 2011-08-13 06:37:50 +02:00