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
Matthew Hoops
aa49b38c5a
Merge remote branch 'upstream/master' into t7g-ios
...
Conflicts:
engines/groovie/script.cpp
2011-05-31 14:16:29 -04: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
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
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
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
6d153f311c
Merge remote branch 'upstream/master' into t7g-ios
...
Conflicts:
video/qt_decoder.cpp
2011-04-13 16:04:29 -04: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
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
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
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
85aabef6fe
VIDEO: Replace Video::VideoTimestamp with Audio::Timestamp
...
svn-id: r55814
2011-02-07 22:57:35 +00:00
Max Horn
357c225f64
VIDEO: Rename VideoDecoder::load() to loadStream()
...
svn-id: r55810
2011-02-07 17:54:16 +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