Commit Graph

209 Commits

Author SHA1 Message Date
D G Turner
69e76182cb VIDEO: Update SVQ1 WIP with minor corrections.
This mainly fixes the Bitstream to Big Endian, MSB to LSB.
2012-04-08 03:29:09 +01:00
D G Turner
da35b9f5f6 VIDEO: Migrate SVQ1 codec WIP to Common::BitStream. 2012-04-08 03:29:06 +01:00
D G Turner
e16270605a VIDEO: Hookup SVQ1 codec to build system and QT Decoder. 2012-04-08 03:29:04 +01:00
D G Turner
c9c16cd1ee VIDEO: Add initial framework and data tables for Sorenson SVQ1 decoder.
This is based on the SVQ1 decoder from FFMPEG.
2012-04-08 03:29:01 +01:00
Matthew Hoops
765a870445 GRAPHICS: Convert JPEG to the ImageDecoder API 2012-03-20 01:06:48 +01:00
Matthew Hoops
be8c557645 AUDIO: Add support for multiple QuickTime audio tracks
This also cleans up the QuickTime audio code to make it a bit more manageable too
2012-03-19 12:04:46 -04:00
Willem Jan Palenstijn
4637d55337 Merge pull request #171 from clone2727/psx-stream-2
This is a manual merge based on clone2727's merge of his branch
with the sword1 subtitle changes on master.
2012-02-23 22:49:59 +01:00
Matthew Hoops
8fea496890 VIDEO: Clarify which PSX streams we can play 2012-02-23 22:48:18 +01:00
Matthew Hoops
66cd8bdd68 VIDEO: Make PSX streams calculate frame timing solely from CD speed
BS2 videos now play at the proper rate and BS1 videos have improved a/v sync.
2012-02-23 22:48:18 +01:00
Matthew Hoops
ee35d32a36 VIDEO: Implement PSX stream v3 frame support 2012-02-23 22:48:18 +01:00
Matthew Hoops
307908662a VIDEO: Add a PlayStation stream decoder
To be used for sword1/sword2 PSX video playback
2012-02-23 22:48:16 +01:00
Tarek Soliman
a4798602d7 JANITORIAL: Fix missing whitespace in pointer cast
find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)
2012-02-15 10:07:10 -06:00
Willem Jan Palenstijn
342fd8cc28 VIDEO: Remove unused variable 2012-02-11 11:36:26 +01:00
Bastien Bouclet
9d85382c15 VIDEO: Fix the BINK decoder to play file whose width is 24px
See https://ffmpeg.org/trac/ffmpeg/ticket/962
2012-02-09 16:10:47 +01:00
Bastien Bouclet
1432011fdc VIDEO: Small refactoring of the Bink Decoder
This allows subclassing the Bink decoder to add seeking support
2012-01-09 08:52:08 +01:00
Torbjörn Andersson
4ac19d8870 VIDEO: Fix cppcheck warnings about possible NULL pointer use. 2011-12-28 00:15:50 +01:00
Matthew Hoops
b367772b5f VIDEO: Add support for QuickTime video track edit lists 2011-12-12 12:28:48 -05:00
Matthew Hoops
35a0fb089a VIDEO: Fix QuickTime audio track ends
Fixes videos where the audio track length is smaller than the video track length.
2011-12-12 12:28:48 -05:00
Matthew Hoops
6bbff58314 VIDEO: Rewrite VMD audio streaming
Audio is now decoded in AudioStream classes instead of being decoded ahead of time and then queued.
2011-11-27 15:52:05 +01:00
Christoph Mallon
e578cb8976 ALL: Remove unnecessary forward declarations. 2011-11-21 15:59:19 +01:00
Eugene Sandulenko
f5e4d63a77 Merge pull request #80 from DrMcCoy/newbitstream
COMMON: Rewrite Common::BitStream as a template
2011-10-20 09:27:26 -07:00
Matthew Hoops
842b471e45 VIDEO: Ensure the sample to chunk index remains valid 2011-10-07 14:18:08 -04:00
Matthew Hoops
6a54c7953a VIDEO: Fix getNextFramePacket() to actually be efficient 2011-10-07 11:34:30 -04:00
Matthew Hoops
a064b7bc0b VIDEO: Fix Cinepak variant detection 2011-10-07 11:34:03 -04:00
Matthew Hoops
5fab8cb521 VIDEO: Ensure audio paused status remains after a QuickTime seek 2011-10-07 11:33:24 -04:00
Einar Johan T. Sømåen
9468e6d24e VIDEO: Add missing include to bink_decoder.h 2011-10-02 00:50:43 +02:00
Bastien Bouclet
cf54fc98d5 VIDEO: Fix Bink bundle count lenghts to be computed like ffmpeg does.
Fixes several movies in Myst 3.
2011-09-18 09:38:30 +02:00
Sven Hesse
c9a59235b2 VIDEO: Use the BitStream implementation in Common
Removing/Replacing the custom implementation
2011-08-28 13:55:47 +02:00
Sven Hesse
f1724f1637 COMMON: Rewrite BitStream as a template
This rewrites BitStream as a template, allowing for more different
memory layouts of the actual bit data.
2011-08-27 23:37:07 +02:00
Alyssa Milburn
c39245b771 VIDEO: Remove incorrect TO_LE_16 calls from Bink audio code. 2011-08-06 10:44:16 +02:00
Sven Hesse
62862ecb23 VIDEO: Don't depend on IEEE floats for Bink audio 2011-07-24 23:56:56 +02:00
Littleboy
da60ff3ded JANITORIAL: Fix MSVC warnings
- Conversion from double to float
 - Unary minus operator applied to unsigned type
 - ARRAYSIZE redefinition
2011-07-19 14:12:07 -04:00
Matthew Hoops
d38fa57d1b VIDEO: Fix typo with last commit 2011-07-19 10:15:51 -04:00
Matthew Hoops
7484ba037c VIDEO: Better handle failing loading Smacker videos 2011-07-19 09:41:31 -04:00
Matthew Hoops
724d7ef101 VIDEO: Use C++ versions of exp/ldexp
Should fix compilation on Mac PPC, and MinGW32 on buildbot
2011-07-19 07:35:40 -04:00
Filippos Karapetis
e1ca235c44 BINK decoder: Fixed compilation with MSVC 2011-07-19 10:50:48 +03:00
D G Turner
54f25aa843 COMMON: Renamed Integer Log2 function from log2 to intLog2.
This avoids naming collisions with system libraries on some platforms
i.e. DS, DC where the log2 is realised by macro.
2011-07-19 02:29:13 +01:00
clone2727
6370984b22 Merge pull request #50 from clone2727/bink
Add support for Bink video to SCUMM HE
2011-07-18 16:04:39 -07:00
Matthew Hoops
a50abde1b1 BUILD: Allow for disabling Bink support 2011-07-13 12:08:26 -04:00
Matthew Hoops
f0cc1eb58b VIDEO: Add more to the BinkDecoder class comment 2011-07-02 21:11:21 -04:00
Matthew Hoops
ccfb7cb86f VIDEO: Remember to call reset() from BinkDecoder::close() 2011-07-02 19:53:15 -04:00
Matthew Hoops
7c28d22ca0 VIDEO: Fix mismatched new[]/free 2011-07-02 19:37:46 -04:00
Matthew Hoops
82ed30817d VIDEO: Cleanup Bink a bit
- Fix playing videos back-to-back
- Silence a cast warning
2011-07-02 19:23:49 -04:00
Johannes Schickel
7e4224e52a COMMON: Fix compilation when USE_HASHMAP_MEMORY_POOL is not defined. 2011-07-03 00:16:07 +02:00
Matthew Hoops
4c065363a0 VIDEO: Fix Bink RDFT stereo
Thanks to DrMcCoy
2011-07-02 17:32:36 -04:00
Matthew Hoops
fffe7a9cc0 VIDEO: Remove Bink header check from Smacker 2011-07-02 16:37:24 -04:00
Matthew Hoops
4ace7f626b VIDEO: Add Bink video decoder
Based on eos' code which is in turn based on FFmpeg's code
2011-07-02 16:36:37 -04:00
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
Max Horn
85aabef6fe VIDEO: Replace Video::VideoTimestamp with Audio::Timestamp
svn-id: r55814
2011-02-07 22:57:35 +00:00
Max Horn
4a16e0911f typo
svn-id: r55812
2011-02-07 18:20:17 +00:00
Max Horn
12f919a8e8 VIDEO: Try to clarify VideoDecoder docs a bit
Also re-arranged the methods a bit, into what I hope is a slightly
more logical ordering.

svn-id: r55811
2011-02-07 18:16:45 +00:00
Max Horn
357c225f64 VIDEO: Rename VideoDecoder::load() to loadStream()
svn-id: r55810
2011-02-07 17:54:16 +00:00
Max Horn
ab039812e7 COMMON: OSystem now has a PaletteManager
svn-id: r55806
2011-02-07 17:52:38 +00:00
Max Horn
8981fa3f16 VIDEO: Inline SMK palette
svn-id: r55805
2011-02-07 17:47:20 +00:00
Alyssa Milburn
dda8266ec8 VIDEO: Fix a leak in the Smacker decoder.
If audio was not yet started when a video was closed, the audio
stream would be leaked.

svn-id: r55802
2011-02-07 13:36:59 +00:00
Sven Hesse
3e29897bb7 VIDEO: Fix a gfx glitch
Visible in some Inca 2 videos

svn-id: r55505
2011-01-24 16:06:27 +00:00
Sven Hesse
6ca13f926d VIDEO: Don't fill empty sound slices at the end
svn-id: r55502
2011-01-24 14:09:47 +00:00
Eugene Sandulenko
caa6684752 VIDEO: Move video classes to Video:: namespace
svn-id: r55479
2011-01-23 19:08:09 +00:00
Eugene Sandulenko
f123802f4c GRAPHICS: Move graphics/video/ to video/. Step 2/2
svn-id: r55474
2011-01-23 17:37:17 +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