* Don't create Stream cookies for unsupported media formats.

Some test clips with sub-title tracks would hang MediaPlayer
   without this fix here.
 * Optimize FindKeyFrame() and Seek(), check the range between
   last requested/reported frame and bail out early with the
   same result. Seems to fix MediaPlayer starting to drop frames
   when it got caught up in a keyframe finding party...


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38808 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp

@@ -725,13 +725,14 @@ StreamBase::GetNextChunk(const void** chunkBuffer,
 /*static*/ int
 StreamBase::_Read(void* cookie, uint8* buffer, int bufferSize)
 {
-	TRACE_IO("StreamBase::_Read(%p, %p, %d)\n",
-		cookie, buffer, bufferSize);
-
 	StreamBase* stream = reinterpret_cast<StreamBase*>(cookie);
 
 	BAutolock _(stream->fSourceLock);
 
+	TRACE_IO("StreamBase::_Read(%p, %p, %d) position: %lld/%lld\n",
+		cookie, buffer, bufferSize, stream->fPosition,
+		stream->fSource->Position());
+
 	if (stream->fPosition != stream->fSource->Position()) {
 		off_t position
 			= stream->fSource->Seek(stream->fPosition, SEEK_SET);
@@ -977,6 +978,7 @@ AVFormatReader::Stream::Init(int32 virtualIndex)
 		default:
 			TRACE("  unknown type\n");
 			format->type = B_MEDIA_UNKNOWN_TYPE;
+			return B_ERROR;
 			break;
 	}
 
@@ -1277,17 +1279,41 @@ AVFormatReader::Stream::FindKeyFrame(uint32 flags, int64* frame,
 		"%lld, %lld)\n", VirtualIndex(),
 		(flags & B_MEDIA_SEEK_TO_FRAME) ? " B_MEDIA_SEEK_TO_FRAME" : "",
 		(flags & B_MEDIA_SEEK_TO_TIME) ? " B_MEDIA_SEEK_TO_TIME" : "",
-		(flags & B_MEDIA_SEEK_CLOSEST_BACKWARD) ? " B_MEDIA_SEEK_CLOSEST_BACKWARD" : "",
+		(flags & B_MEDIA_SEEK_CLOSEST_BACKWARD)
-		(flags & B_MEDIA_SEEK_CLOSEST_FORWARD) ? " B_MEDIA_SEEK_CLOSEST_FORWARD" : "",
+			? " B_MEDIA_SEEK_CLOSEST_BACKWARD" : "",
+		(flags & B_MEDIA_SEEK_CLOSEST_FORWARD)
+			? " B_MEDIA_SEEK_CLOSEST_FORWARD" : "",
 		*frame, *time);
 
-	if (((flags & B_MEDIA_SEEK_TO_FRAME) != 0
+	bool inLastRequestedRange = false;
-			&& *frame == fLastReportedKeyframe.reportedFrame)
+	if ((flags & B_MEDIA_SEEK_TO_FRAME) != 0) {
-		|| ((flags & B_MEDIA_SEEK_TO_FRAME) == 0
+		if (fLastReportedKeyframe.reportedFrame
-			&& *time == fLastReportedKeyframe.reportedTime)) {
+			<= fLastReportedKeyframe.requestedFrame) {
+			inLastRequestedRange
+				= *frame >= fLastReportedKeyframe.reportedFrame
+					&& *frame <= fLastReportedKeyframe.requestedFrame;
+		} else {
+			inLastRequestedRange
+				= *frame >= fLastReportedKeyframe.requestedFrame
+					&& *frame <= fLastReportedKeyframe.reportedFrame;
+		}
+	} else if ((flags & B_MEDIA_SEEK_TO_FRAME) == 0) {
+		if (fLastReportedKeyframe.reportedTime
+			<= fLastReportedKeyframe.requestedTime) {
+			inLastRequestedRange
+				= *time >= fLastReportedKeyframe.reportedTime
+					&& *time <= fLastReportedKeyframe.requestedTime;
+		} else {
+			inLastRequestedRange
+				= *time >= fLastReportedKeyframe.requestedTime
+					&& *time <= fLastReportedKeyframe.reportedTime;
+		}
+	}
+
+	if (inLastRequestedRange) {
 		*frame = fLastReportedKeyframe.reportedFrame;
 		*time = fLastReportedKeyframe.reportedTime;
-		TRACE_FIND("  same as last reported frame\n");
+		TRACE_FIND("  same as last reported keyframe\n");
 		return B_OK;
 	}
 
@@ -1353,10 +1379,32 @@ AVFormatReader::Stream::Seek(uint32 flags, int64* frame, bigtime_t* time)
 	// that the sought frame/time will then match the reported values.
 	// TODO: Will not work if client changes seek flags (from backwards to
 	// forward or vice versa)!!
-	if (((flags & B_MEDIA_SEEK_TO_FRAME) != 0
+	bool inLastRequestedRange = false;
-			&& fLastReportedKeyframe.reportedFrame == *frame)
+	if ((flags & B_MEDIA_SEEK_TO_FRAME) != 0) {
-		|| ((flags & B_MEDIA_SEEK_TO_TIME) != 0
+		if (fLastReportedKeyframe.reportedFrame
-			&& fLastReportedKeyframe.reportedTime == *time)) {
+			<= fLastReportedKeyframe.requestedFrame) {
+			inLastRequestedRange
+				= *frame >= fLastReportedKeyframe.reportedFrame
+					&& *frame <= fLastReportedKeyframe.requestedFrame;
+		} else {
+			inLastRequestedRange
+				= *frame >= fLastReportedKeyframe.requestedFrame
+					&& *frame <= fLastReportedKeyframe.reportedFrame;
+		}
+	} else if ((flags & B_MEDIA_SEEK_TO_FRAME) == 0) {
+		if (fLastReportedKeyframe.reportedTime
+			<= fLastReportedKeyframe.requestedTime) {
+			inLastRequestedRange
+				= *time >= fLastReportedKeyframe.reportedTime
+					&& *time <= fLastReportedKeyframe.requestedTime;
+		} else {
+			inLastRequestedRange
+				= *time >= fLastReportedKeyframe.requestedTime
+					&& *time <= fLastReportedKeyframe.reportedTime;
+		}
+	}
+
+	if (inLastRequestedRange) {
 		*frame = fLastReportedKeyframe.requestedFrame;
 		*time = fLastReportedKeyframe.requestedTime;
 		flags = fLastReportedKeyframe.seekFlags;