libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 14:51:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

VIDEO: uplift 3do movie decoder from sherlock engine

Browse Source 
The format is generic to 3DO and is also used by plumbers.
I think it's also accelerated on 3DO so probably is used by
a lot of 3DO titles
This commit is contained in:
Vladimir Serbinenko 2020-10-20 23:12:11 +02:00 committed by Eugene Sandulenko
parent f3f0d0228a
commit ce6eb34121
6 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/sherlock/module.mk
View File

@ -2,7 +2,6 @@ MODULE := engines/sherlock
MODULE_OBJS = \
scalpel/scalpel.o \
scalpel/3do/movie_decoder.o \
scalpel/3do/scalpel_3do_screen.o \
scalpel/drivers/adlib.o \
scalpel/drivers/mt32.o \

4
engines/sherlock/scalpel/scalpel.cpp
View File

@ -34,7 +34,7 @@
#include "sherlock/sherlock.h"
#include "sherlock/music.h"
#include "sherlock/animation.h"
#include "sherlock/scalpel/3do/movie_decoder.h"
#include "video/3do_decoder.h"
namespace Sherlock {
@ -1272,7 +1272,7 @@ void ScalpelEngine::showScummVMRestoreDialog() {
bool ScalpelEngine::play3doMovie(const Common::String &filename, const Common::Point &pos, bool isPortrait) {
Scalpel3DOScreen &screen = *(Scalpel3DOScreen *)_screen;
Scalpel3DOMovieDecoder *videoDecoder = new Scalpel3DOMovieDecoder();
Video::ThreeDOMovieDecoder *videoDecoder = new Video::ThreeDOMovieDecoder();
Graphics::ManagedSurface tempSurface;
Common::Point framePos(pos.x, pos.y);

1
engines/sherlock/scalpel/scalpel_talk.cpp
View File

@ -30,7 +30,6 @@
#include "sherlock/scalpel/scalpel_user_interface.h"
#include "sherlock/scalpel/scalpel.h"
#include "sherlock/screen.h"
#include "sherlock/scalpel/3do/movie_decoder.h"
namespace Sherlock {

56
engines/sherlock/scalpel/3do/movie_decoder.cpp → video/3do_decoder.cpp
View File

@ -27,7 +27,7 @@
#include "audio/audiostream.h"
#include "audio/decoders/3do.h"
#include "sherlock/scalpel/3do/movie_decoder.h"
#include "video/3do_decoder.h"
#include "image/codecs/cinepak.h"
// for Test-Code
@ -40,19 +40,19 @@
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
namespace Sherlock {
namespace Video {
Scalpel3DOMovieDecoder::Scalpel3DOMovieDecoder()
ThreeDOMovieDecoder::ThreeDOMovieDecoder()
: _stream(0), _videoTrack(0), _audioTrack(0) {
_streamVideoOffset = 0;
_streamAudioOffset = 0;
}
Scalpel3DOMovieDecoder::~Scalpel3DOMovieDecoder() {
ThreeDOMovieDecoder::~ThreeDOMovieDecoder() {
close();
}
bool Scalpel3DOMovieDecoder::loadStream(Common::SeekableReadStream *stream) {
bool ThreeDOMovieDecoder::loadStream(Common::SeekableReadStream *stream) {
uint32 videoSubType = 0;
uint32 videoCodecTag = 0;
uint32 videoHeight = 0;
@ -92,7 +92,7 @@ bool Scalpel3DOMovieDecoder::loadStream(Common::SeekableReadStream *stream) {
case MKTAG('F', 'H', 'D', 'R'):
// FILM header found
if (_videoTrack) {
warning("Sherlock 3DO movie: Multiple FILM headers found");
warning("3DO movie: Multiple FILM headers found");
close();
return false;
}
@ -111,7 +111,7 @@ bool Scalpel3DOMovieDecoder::loadStream(Common::SeekableReadStream *stream) {
break;
default:
warning("Sherlock 3DO movie: Unknown subtype inside FILM packet");
warning("3DO movie: Unknown subtype inside FILM packet");
close();
return false;
}
@ -128,7 +128,7 @@ bool Scalpel3DOMovieDecoder::loadStream(Common::SeekableReadStream *stream) {
// Bail if we already have a track
if (_audioTrack) {
warning("Sherlock 3DO movie: Multiple SNDS headers found");
warning("3DO movie: Multiple SNDS headers found");
close();
return false;
}
@ -154,7 +154,7 @@ bool Scalpel3DOMovieDecoder::loadStream(Common::SeekableReadStream *stream) {
// Audio data
break;
default:
warning("Sherlock 3DO movie: Unknown subtype inside FILM packet");
warning("3DO movie: Unknown subtype inside FILM packet");
close();
return false;
}
@ -173,7 +173,7 @@ bool Scalpel3DOMovieDecoder::loadStream(Common::SeekableReadStream *stream) {
break;
default:
warning("Unknown chunk-tag '%s' inside Sherlock 3DO movie", tag2str(chunkTag));
warning("Unknown chunk-tag '%s' inside 3DO movie", tag2str(chunkTag));
close();
return false;
}
@ -197,7 +197,7 @@ bool Scalpel3DOMovieDecoder::loadStream(Common::SeekableReadStream *stream) {
return true;
}
void Scalpel3DOMovieDecoder::close() {
void ThreeDOMovieDecoder::close() {
Video::VideoDecoder::close();
delete _stream; _stream = 0;
@ -206,7 +206,7 @@ void Scalpel3DOMovieDecoder::close() {
// We try to at least decode 1 frame
// and also try to get at least 0.5 seconds of audio queued up
void Scalpel3DOMovieDecoder::readNextPacket() {
void ThreeDOMovieDecoder::readNextPacket() {
uint32 currentMovieTime = getTime();
uint32 wantedAudioQueued = currentMovieTime + 500; // always try to be 0.500 seconds in front of movie time
@ -300,7 +300,7 @@ void Scalpel3DOMovieDecoder::readNextPacket() {
break;
default:
error("Sherlock 3DO movie: Unknown subtype inside FILM packet");
error("3DO movie: Unknown subtype inside FILM packet");
break;
}
break;
@ -332,7 +332,7 @@ void Scalpel3DOMovieDecoder::readNextPacket() {
break;
default:
error("Sherlock 3DO movie: Unknown subtype inside SNDS packet");
error("3DO movie: Unknown subtype inside SNDS packet");
break;
}
break;
@ -349,7 +349,7 @@ void Scalpel3DOMovieDecoder::readNextPacket() {
break;
default:
error("Unknown chunk-tag '%s' inside Sherlock 3DO movie", tag2str(chunkTag));
error("Unknown chunk-tag '%s' inside 3DO movie", tag2str(chunkTag));
}
// Always seek to end of chunk
@ -362,7 +362,7 @@ void Scalpel3DOMovieDecoder::readNextPacket() {
}
}
Scalpel3DOMovieDecoder::StreamVideoTrack::StreamVideoTrack(uint32 width, uint32 height, uint32 codecTag, uint32 frameCount) {
ThreeDOMovieDecoder::StreamVideoTrack::StreamVideoTrack(uint32 width, uint32 height, uint32 codecTag, uint32 frameCount) {
_width = width;
_height = height;
_frameCount = frameCount;
@ -373,27 +373,27 @@ Scalpel3DOMovieDecoder::StreamVideoTrack::StreamVideoTrack(uint32 width, uint32
if (codecTag == MKTAG('c', 'v', 'i', 'd'))
_codec = new Image::CinepakDecoder();
else
error("Unsupported Sherlock 3DO movie video codec tag '%s'", tag2str(codecTag));
error("Unsupported 3DO movie video codec tag '%s'", tag2str(codecTag));
}
Scalpel3DOMovieDecoder::StreamVideoTrack::~StreamVideoTrack() {
ThreeDOMovieDecoder::StreamVideoTrack::~StreamVideoTrack() {
delete _codec;
}
bool Scalpel3DOMovieDecoder::StreamVideoTrack::endOfTrack() const {
bool ThreeDOMovieDecoder::StreamVideoTrack::endOfTrack() const {
return getCurFrame() >= getFrameCount() - 1;
}
Graphics::PixelFormat Scalpel3DOMovieDecoder::StreamVideoTrack::getPixelFormat() const {
Graphics::PixelFormat ThreeDOMovieDecoder::StreamVideoTrack::getPixelFormat() const {
return _codec->getPixelFormat();
}
void Scalpel3DOMovieDecoder::StreamVideoTrack::decodeFrame(Common::SeekableReadStream *stream, uint32 videoTimeStamp) {
void ThreeDOMovieDecoder::StreamVideoTrack::decodeFrame(Common::SeekableReadStream *stream, uint32 videoTimeStamp) {
_surface = _codec->decodeFrame(*stream);
_curFrame++;
}
Scalpel3DOMovieDecoder::StreamAudioTrack::StreamAudioTrack(uint32 codecTag, uint32 sampleRate, uint32 channels, Audio::Mixer::SoundType soundType) :
ThreeDOMovieDecoder::StreamAudioTrack::StreamAudioTrack(uint32 codecTag, uint32 sampleRate, uint32 channels, Audio::Mixer::SoundType soundType) :
AudioTrack(soundType) {
switch (codecTag) {
case MKTAG('A','D','P','4'):
@ -402,7 +402,7 @@ Scalpel3DOMovieDecoder::StreamAudioTrack::StreamAudioTrack(uint32 codecTag, uint
break;
default:
error("Unsupported Sherlock 3DO movie audio codec tag '%s'", tag2str(codecTag));
error("Unsupported 3DO movie audio codec tag '%s'", tag2str(codecTag));
}
_totalAudioQueued = 0; // currently 0 milliseconds queued
@ -417,7 +417,7 @@ Scalpel3DOMovieDecoder::StreamAudioTrack::StreamAudioTrack(uint32 codecTag, uint
_stereo = true;
break;
default:
error("Unsupported Sherlock 3DO movie audio channels %d", channels);
error("Unsupported 3DO movie audio channels %d", channels);
}
_audioStream = Audio::makeQueuingAudioStream(sampleRate, _stereo);
@ -427,13 +427,13 @@ Scalpel3DOMovieDecoder::StreamAudioTrack::StreamAudioTrack(uint32 codecTag, uint
memset(&_SDX2_PersistentSpace, 0, sizeof(_SDX2_PersistentSpace));
}
Scalpel3DOMovieDecoder::StreamAudioTrack::~StreamAudioTrack() {
ThreeDOMovieDecoder::StreamAudioTrack::~StreamAudioTrack() {
delete _audioStream;
// free(_ADP4_PersistentSpace);
// free(_SDX2_PersistentSpace);
}
void Scalpel3DOMovieDecoder::StreamAudioTrack::queueAudio(Common::SeekableReadStream *stream, uint32 size) {
void ThreeDOMovieDecoder::StreamAudioTrack::queueAudio(Common::SeekableReadStream *stream, uint32 size) {
Common::SeekableReadStream *compressedAudioStream = 0;
Audio::RewindableAudioStream *audioStream = 0;
uint32 audioLengthMSecs = 0;
@ -460,8 +460,8 @@ void Scalpel3DOMovieDecoder::StreamAudioTrack::queueAudio(Common::SeekableReadSt
}
}
Audio::AudioStream *Scalpel3DOMovieDecoder::StreamAudioTrack::getAudioStream() const {
Audio::AudioStream *ThreeDOMovieDecoder::StreamAudioTrack::getAudioStream() const {
return _audioStream;
}
} // End of namespace Sherlock
} // End of namespace Video

15
engines/sherlock/scalpel/3do/movie_decoder.h → video/3do_decoder.h
View File

@ -39,12 +39,19 @@ namespace Image {
class Codec;
}
namespace Sherlock {
namespace Video {
class Scalpel3DOMovieDecoder : public Video::VideoDecoder {
/**
* Decoder for 3DO videos.
*
* Video decoder used in engines:
* - sherlock
* - plumbers
*/
class ThreeDOMovieDecoder : public Video::VideoDecoder {
public:
Scalpel3DOMovieDecoder();
~Scalpel3DOMovieDecoder() override;
ThreeDOMovieDecoder();
~ThreeDOMovieDecoder() override;
bool loadStream(Common::SeekableReadStream *stream) override;
void close() override;

1
video/module.mk
View File

@ -1,6 +1,7 @@
MODULE := video
MODULE_OBJS := \
3do_decoder.o \
avi_decoder.o \
coktel_decoder.o \
dxa_decoder.o \