ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
137,148 Commits 45 Branches 139 Tags
de151ea3fddd6a2d36a41400a55366bd2a6a94de
Commit Graph
49 Commits
Author SHA1 Message Date
Paweł Kołodziejski 34466b8732 GRIM: Convert warning message to debug 2022-01-16 21:44:24 +01:00
Paweł Kołodziejski 20cb0ae228 ALL: Cleanup ResidualVM -> ScummVM 2021-12-26 21:19:38 +01:00
Eugene Sandulenko abea37c9bb ALL: Update ScummVM project license to GPLv3+ 2021-12-26 18:48:43 +01:00
Paweł Kołodziejski 15f1f86bfe GRIM: Remove end lines from warning() messages 2020-11-12 10:51:13 +01:00
Pawel Kolodziejski f8570d332f GRIM: Fixed smush compilation 2020-10-07 20:33:50 +02:00
Pawel Kolodziejski 1e26030a51 GRIM: Attempt to fix travis builds 2020-10-07 20:09:42 +02:00
Einar Johan Trøan Sømåen 1e5f5d6947 HACK: Add support for playing Theora-videos from the SmushPlayer, when playback of SMUSH-fails, this should perhaps result in a new class for handling codecs dynamically (so that we can resolve both the Aspyr-logo and Theora/Smush-juggling in a consistent way). Also hack the scaling for 1080p-videos for now. 2015-02-01 16:06:15 +01:00
Pawel Kolodziejski 8759900b6a ALL: synced with ScummVM 2014-04-05 18:18:42 +02:00
Joel Teichroeb e06677d2e8 GRIM: Silence a comparison between signed and unsigned warning 2013-12-02 22:47:51 -08:00
Einar Johan Trøan Sømåen fe3883cecd GRIM: Reformat code to be closer to convention. 2013-07-09 21:12:55 +02:00
Joel Teichroeb 4eb508cb61 GRIM: Use const references for strings 2013-07-07 20:56:24 -07:00
Giulio Camuffo 66ba0f4c95 GRIM/Movies: Cleanup outdated comments. 2013-01-14 23:23:47 +01:00
Giulio Camuffo d052d6259d GRIM/Movie: Lock the frame mutex when restoring a savegame. 
Fix a race condition which could make it seek to time 0 instead of the time
saved in the savegame.
 2013-01-14 14:35:36 +01:00
Giulio Camuffo cafe925961 GRIM/Movie: Enable seeking at savegame restore. 2013-01-14 14:35:03 +01:00
Einar Johan Trøan Sømåen bc5ca044a5 Merge pull request #668 from somaen/videoFixes 
Update VideoDecoders to use the new VideoDecoder-interface (for testing)
 2013-01-02 01:04:14 -08:00
Einar Johan Trøan Sømåen 65052f9da4 GRIM/SMUSH: Fix drawing the last frame for the correct duration. 2012-12-31 17:10:04 +01:00
Einar Johan Trøan Sømåen 2472cc83a3 GRIM/SMUSH: Fix looping videos 2012-12-31 13:02:46 +01:00
Paweł Kołodziejski 175620b62a ALL: change license headers from LGPL to GPL, and few updates 2012-12-19 23:15:43 +01:00
Einar Johan Trøan Sømåen f5e3d0c323 GRIM: Rewrite SMUSH-decoder to use the new VideoDecoder-interface 2012-11-28 23:59:12 +01:00
Einar Johan Trøan Sømåen 57e8393ac5 VIDEO: Add in the files for the new VideoInterface from ScummVM. (And disable Bink/Smush for now) 2012-11-27 02:54:02 +01:00
Joel Teichroeb aa8b2d1051 GRIM: Remove the dynamic_cast from smush 2012-04-30 22:35:21 -07:00
Paweł Kołodziejski 09cd98cda8 COMMON: mpeg2 is now needed for EMI, zlib needed for GRIM engine. USE_SMUSH not used anymore 2012-02-24 21:36:16 +01:00
Paweł Kołodziejski e350c7f777 renames 2012-01-06 23:29:45 +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 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 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 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 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 5e93a6f9b1 GRIM: Refactor the smush-decoder into a subclass of VideoDecoder 2011-10-01 02:51:55 +02: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
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 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 c3b69b6afa GRIM: add USE_SMUSH-protection for fixing USE_ZLIB 2011-08-13 07:19:51 +02:00
Giulio Camuffo 5f59fff5b3 GRIM: Move the debug levels enum in a separate header. 2011-07-23 15:37:14 +02:00
Giulio Camuffo 564ae5d112 GRIM: Get immediately a frame to draw, thus avoiding flickering. 2011-07-14 16:41:21 +02:00
Joni Vähämäki 1fd1403af2 GRIM: Use a float for the movie time to make it more accurate (fixes subtitles going out of sync with the video). 2011-06-06 16:43:04 +08:00
Andrea Corna 970b738e8a GRIM: Prevent a crash if StartFullscreenMovie or StartMovie are called with a non-existant file 2011-05-26 14:23:54 +08:00
JenniBee 7e63184810 fixing compilation on mingw32 2011-05-24 13:03:59 -04:00
Pawel Kolodziejski 356c9c8c07 sync with scummvm 2011-05-18 23:33:39 +02:00
Pawel Kolodziejski 43eee42916 GRIM: restore factory-functions in movie player 2011-05-14 18:17:26 +02:00
Pawel Kolodziejski 83de2e6600 refactor movie playback and game detection params 2011-05-14 12:11:53 +02:00