[Scummvm-cvs-logs] scummvm master -> 45c58982308210e50610b5f5997a45f33c09ac40

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
45c5898230 SHERLOCK: 3DO movie player comments


Commit: 45c58982308210e50610b5f5997a45f33c09ac40
    https://github.com/scummvm/scummvm/commit/45c58982308210e50610b5f5997a45f33c09ac40
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-04T16:01:43+02:00

Commit Message:
SHERLOCK: 3DO movie player comments

Changed paths:
    engines/sherlock/scalpel/3do/movie_decoder.cpp



diff --git a/engines/sherlock/scalpel/3do/movie_decoder.cpp b/engines/sherlock/scalpel/3do/movie_decoder.cpp
index a50362c..8aefa42 100644
--- a/engines/sherlock/scalpel/3do/movie_decoder.cpp
+++ b/engines/sherlock/scalpel/3do/movie_decoder.cpp
@@ -268,9 +268,10 @@ void Scalpel3DOMovieDecoder::readNextPacket() {
 			case MKTAG('F', 'R', 'M', 'E'):
 				// Found frame data
 				if (_streamVideoOffset <= chunkOffset) {
+					// We are at an offset that is still relevant to video decoding
 					if (!videoDone) {
 						if (!videoGotFrame) {
-							// If we previously found one, this is just to get the time offset of the next one
+							// We haven't decoded any frame yet, so do so now
 							_stream->readUint32BE();
 							videoFrameSize = _stream->readUint32BE();
 							_videoTrack->decodeFrame(_stream->readStream(videoFrameSize), videoTimeStamp);
@@ -279,7 +280,8 @@ void Scalpel3DOMovieDecoder::readNextPacket() {
 							videoGotFrame = true;
 
 						} else {
-							// Already decoded a frame, so seek back to current chunk and exit
+							// Already decoded a frame, so get timestamp of follow-up frame
+							// and then we are done with video
 
 							// Calculate next frame time
 							// 3DO clock time for movies runs at 240Hh, that's why timestamps are based on 240.
@@ -314,6 +316,7 @@ void Scalpel3DOMovieDecoder::readNextPacket() {
 			case MKTAG('S', 'S', 'M', 'P'):
 				// Got audio chunk
 				if (_streamAudioOffset <= chunkOffset) {
+					// We are at an offset that is still relevant to audio decoding
 					if (!audioDone) {
 						audioBytes = _stream->readUint32BE();
 						_audioTrack->queueAudio(_stream, audioBytes);