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

VIDEO: Fix VideoDecoder::needsUpdate to work for audio-only files

Browse Source 
VideoDecoder::needsUpdate() only returns true if there are frames
remaining to be rendered. This won't work for video files that are
audio-only, so in the event of a such a file, fall back to checking
endOfVideo() which includes audio tracks.

Fixes audio-only DigitalVideoCastMembers in the Director engine.

Fixes playback of the cupcake song in Chop Suey.
This commit is contained in:
Scott Percival 2022-09-30 21:46:04 +08:00 committed by Eugene Sandulenko
parent dcceb4c34b
commit 32f87b27cb
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
video/video_decoder.cpp
View File

@ -96,7 +96,26 @@ bool VideoDecoder::loadFile(const Common::Path &filename) {
} }
bool VideoDecoder::needsUpdate() const { bool VideoDecoder::needsUpdate() const {
bool hasVideo = false;
bool hasAudio = false;
for (auto &it : _tracks) {
switch (it->getTrackType()) {
case Track::kTrackTypeAudio:
hasAudio = true;
break;
case Track::kTrackTypeVideo:
hasVideo = true;
break;
default:
break;
}
}
if (hasVideo) {
return hasFramesLeft() && getTimeToNextFrame() == 0; return hasFramesLeft() && getTimeToNextFrame() == 0;
} else if (hasAudio) {
return !endOfVideo();
}
return false;
} }
void VideoDecoder::pauseVideo(bool pause) { void VideoDecoder::pauseVideo(bool pause) {