Commit Graph

60 Commits

Author SHA1 Message Date
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +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
Max Horn
357c225f64 VIDEO: Rename VideoDecoder::load() to loadStream()
svn-id: r55810
2011-02-07 17:54:16 +00:00
Filippos Karapetis
d4e1260b7e SWORD25: Some optimizations to the Theora decoder
- Optimized and cleaned up translateYUVtoRGBA()
- Disabled a lot of seeking-related functionality
- Replaced some calloc() calls, used for audio buffer creation with malloc()

svn-id: r55666
2011-01-30 20:39:02 +00:00
Filippos Karapetis
2e42c2d11d SWORD25: Some translations, and a bugfix. Disabled a hack.
Translated some comments, and pushed the indirect rendering define to the header
file, so that the engine won't try and update the screen with direct movie rendering.
Also, the thumbnail hack has been disabled, as it doesn't really work (at least not for
me: all the thumbnails are gray)

svn-id: r55663
2011-01-30 20:34:47 +00:00
Eugene Sandulenko
caa6684752 VIDEO: Move video classes to Video:: namespace
svn-id: r55479
2011-01-23 19:08:09 +00:00
Torbjörn Andersson
85406467e2 SWORD25: Remove unused yuvtorgba.h file
svn-id: r55475
2011-01-23 17:52:29 +00:00
Eugene Sandulenko
806ccf5d25 GRAPHICS: Move graphics/video/ to video/. Step 1/2
svn-id: r55473
2011-01-23 17:14:43 +00:00
Filippos Karapetis
160517da93 SWORD25: Simplified the YUV->RGBA conversion code
svn-id: r55469
2011-01-23 16:14:51 +00:00
Filippos Karapetis
1250785822 SWORD25: Replaced BS_ASSERT() with assert()
svn-id: r55464
2011-01-23 15:01:24 +00:00
Filippos Karapetis
04af67d736 SWORD25: Fixed compilation
svn-id: r55463
2011-01-23 14:57:21 +00:00
Filippos Karapetis
00a0f8d15d SWORD25: Removed the custom log class and replaced it with warning/error/debugC calls
svn-id: r55462
2011-01-23 14:49:50 +00:00
Torbjörn Andersson
aa9786604c JANITORIAL: Remove unnecessary semicolon.
svn-id: r55077
2010-12-31 15:19:42 +00:00
Matthew Hoops
375f32fbe9 VIDEO: Make VideoDecoder::decodeNextFrame() return a const Surface pointer
svn-id: r54927
2010-12-16 01:35:13 +00:00
Max Horn
0c018bf392 SWORD25: cleanup
svn-id: r54045
2010-11-03 00:19:28 +00:00
Torbjörn Andersson
71e08336c0 SWORD25: Play the cutscene audio
Once the audio buffer has been queued in the audio stream, the Theora
decoder is no longer responsible for it. It has to allocate a new
audio buffer for the next set of audio data.

Of course, at the moment the audio is pretty useless because the
playback speed is all wrong.

svn-id: r53939
2010-10-30 09:17:21 +00:00
Torbjörn Andersson
09c678e363 SWORD25: Fix hanging cutscene video
Even though our video player does not (yet) support audio, we need to
adjust the values of _audiobufFill and _audiobufReady as if it did, or
it will never realize it has reached the end of the cutscene.

Also fixes what looks like a typo in audio data clipping.

svn-id: r53938
2010-10-30 08:21:10 +00:00
Max Horn
e761f76653 SWORD25: Get rid of most of the 'kernel service/superclass' code
svn-id: r53835
2010-10-25 22:41:25 +00:00
Eugene Sandulenko
6629efc676 SWORD25: Enforced code formatting rules in rest of the engine
svn-id: r53626
2010-10-19 21:03:33 +00:00
Eugene Sandulenko
bbd95da899 SWORD25: Fix engine exit when running without theoradec
svn-id: r53622
2010-10-19 20:52:06 +00:00
Eugene Sandulenko
d94435eebd SWORD25: Enforce code naming conventions in gfx/graphicengine*
svn-id: r53621
2010-10-19 20:51:21 +00:00
Max Horn
550073ee04 SWORD25: Do not use Kernel::GetService directly anymore
svn-id: r53477
2010-10-15 12:18:19 +00:00
Paul Gilbert
96585f24d9 SWORD25: Fix unloading of movies so the menu animation properly loops
svn-id: r53474
2010-10-15 10:52:23 +00:00
Eugene Sandulenko
f67bbc4ecc SWORD25: Attempt to optimize movie rendering
Current code makes about 5 blits of each frame which is a huge
overhead. This code is an attempt to make that 1. Doesn't work yet
as the rendering pipe keeps blitting invisible pictures.

svn-id: r53459
2010-10-14 20:44:44 +00:00
Filippos Karapetis
96e05a1ff9 SWORD25: Hopefully fix compilation when libtheora is not present
svn-id: r53439
2010-10-13 17:42:56 +00:00
Filippos Karapetis
de3534fcd3 SWORD25: Include common/scummsys.h in places where USE_THEORADEC is used
svn-id: r53423
2010-10-13 14:13:48 +00:00
Filippos Karapetis
d83a70af43 SWORD25: Renamed ENABLE_THEORADEC to USE_THEORADEC (like in configure)
svn-id: r53418
2010-10-13 13:32:30 +00:00
Filippos Karapetis
f2d9319d9e SWORD25: Renamed ENABLE_THEORA to ENABLE_THEORADEC (like in configure)
svn-id: r53417
2010-10-13 13:27:55 +00:00
Filippos Karapetis
681ec59292 SWORD25: Added a ENABLE_THEORA define inside fmv/theora_decoder.h
This define can be used to disable building of the Theora decoder, and thus makes
libtheora optional (therefore resolving an item in the Sword25 TODO). Disabling the
Theora decoder will effectively disable the game's videos

Note that running the game with the Theora decoder disabled is still untested

svn-id: r53416
2010-10-13 13:07:16 +00:00
Eugene Sandulenko
54ccc8f4c9 SWORD25: Enforced code naming conventions in script/*
svn-id: r53391
2010-10-13 00:08:28 +00:00
Eugene Sandulenko
bf22def884 SWORD25: Enforce code naming conventions in fmv/*
svn-id: r53388
2010-10-13 00:06:37 +00:00
Eugene Sandulenko
8582c1ad57 SWORD25: Enforse code naming conventions in PackageManager and Sword25Engine
svn-id: r53380
2010-10-13 00:02:51 +00:00
Eugene Sandulenko
e5ac21dcac SWORD25: Fix some warnings
svn-id: r53338
2010-10-12 23:44:14 +00:00
Eugene Sandulenko
06bce68860 SWORD25: Comply to the code conventions for several classes
svn-id: r53310
2010-10-12 23:32:32 +00:00
Eugene Sandulenko
086f5961b6 SWORD25: unsigned int -> uint
svn-id: r53309
2010-10-12 23:30:00 +00:00
Eugene Sandulenko
0cdb2ded85 SWORD25: unsigned char -> byte
svn-id: r53308
2010-10-12 23:26:48 +00:00
Paul Gilbert
2b2330ce65 SWORD25: Movie playback now works
svn-id: r53303
2010-10-12 23:24:31 +00:00
Eugene Sandulenko
77cfc17075 SWORD25: Formatting fixes
svn-id: r53302
2010-10-12 23:23:48 +00:00
Eugene Sandulenko
3b80a93782 SWORD25: Put back changes accidentally removed in previous merge.
svn-id: r53301
2010-10-12 23:23:29 +00:00
Paul Gilbert
3d3f1db15c SWORD25: Merge of my pending changes to movie playback
svn-id: r53300
2010-10-12 23:23:10 +00:00
Eugene Sandulenko
579d872e96 SWORD25: Bugfixes for video playback.
svn-id: r53299
2010-10-12 23:22:46 +00:00
Eugene Sandulenko
f06db87a0e SWORD25: Implement playback. Blitting is TODO.
svn-id: r53298
2010-10-12 23:22:24 +00:00
Eugene Sandulenko
384468c014 SWORD25: Started to hook TheoraDecoder. Crashes at startup.
svn-id: r53297
2010-10-12 23:22:01 +00:00
Eugene Sandulenko
f71295ab6d Revert "SWORD25: Commit of in-progress MoviePlayer code"
This reverts commit cb95db7cc0.

svn-id: r53296
2010-10-12 23:21:28 +00:00
Paul Gilbert
cb95db7cc0 SWORD25: Commit of in-progress MoviePlayer code
Frames aren't being corrected decoded yet; still trying to locate the cause

svn-id: r53295
2010-10-12 23:20:33 +00:00
Eugene Sandulenko
b01994a53b SWORD25: removed BS_ prefix from rest of the classes.
The things which are intentionally left with the prefix:
BS_LOG, BS_ASSERT, BS_Rect, BS_String.

svn-id: r53261
2010-10-12 22:59:01 +00:00
Eugene Sandulenko
be44216e5c SWORD25: eliminated BS_ prefix in all but kernel/
svn-id: r53259
2010-10-12 22:55:59 +00:00
Eugene Sandulenko
485ff15d23 SWORD25: Mass-eliminating of BS_ prefix in fmv/ and gfx/
svn-id: r53258
2010-10-12 22:53:49 +00:00
Paul Gilbert
596684101e SWORD25: Added implementation of rint method
Windows doesn't seem to implement this method; even examples for FMOD I saw had WIN32 defines that manually provided the method.

svn-id: r53256
2010-10-12 22:51:06 +00:00
Eugene Sandulenko
47904bc7b2 SWORD25: Mass-astyle.
svn-id: r53222
2010-10-12 22:35:55 +00:00