thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NANCY: Add function atEnd() to AVFVideoDecoder

Browse source 
Added a function to check if a video has reached its end that
respects the timing of the last frame. This is useful for videos that
loop after the last frame ends (e.g. secondary videos in The
Vampire Diaries)
This commit is contained in:
Kaloyan Chehlarski 2023-02-28 23:14:21 +02:00
parent f34762aef9
commit 7c534ca1c3
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/nancy/video.cpp
View file

@ -76,6 +76,12 @@ void AVFDecoder::addFrameTime(const uint16 timeToAdd) {
((AVFDecoder::AVFVideoTrack *)getTrack(0))->_frameTime += timeToAdd;
}
// Custom function to allow the last frame of the video to play correctly
bool AVFDecoder::atEnd() const {
const AVFDecoder::AVFVideoTrack *track = ((const AVFDecoder::AVFVideoTrack *)getTrack(0));
return !track->isReversed() && track->endOfTrack() && track->getFrameTime(track->getFrameCount()) <= getTime();
}
AVFDecoder::AVFVideoTrack::AVFVideoTrack(Common::SeekableReadStream *stream, uint32 chunkFileFormat) {
assert(stream);
_fileStream = stream;

1
engines/nancy/video.h
View file

@ -44,6 +44,7 @@ public:
bool loadStream(Common::SeekableReadStream *stream) override;
const Graphics::Surface *decodeFrame(uint frameNr);
void addFrameTime(const uint16 timeToAdd);
bool atEnd() const;
private:
class AVFVideoTrack : public FixedRateVideoTrack {