[haiku-commits] r38853 - haiku/trunk/src/add-ons/media/plugins/ffmpeg
- From: superstippi@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 29 Sep 2010 17:20:12 +0200 (CEST)
Author: stippi
Date: 2010-09-29 17:20:12 +0200 (Wed, 29 Sep 2010)
New Revision: 38853
Changeset: http://dev.haiku-os.org/changeset/38853
Modified:
haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
Log:
* Try harder to seek somewhere and fall back to seeking
to the beginning of the stream by bytes, if all else
fails.
Modified: haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
2010-09-29 15:18:30 UTC (rev 38852)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
2010-09-29 15:20:12 UTC (rev 38853)
@@ -32,7 +32,7 @@
# define TRACE printf
# define TRACE_IO(a...)
# define TRACE_SEEK(a...) printf(a)
-# define TRACE_FIND(a...) printf(a)
+# define TRACE_FIND(a...)
# define TRACE_PACKET(a...)
#else
# define TRACE(a...)
@@ -554,7 +554,9 @@
int64_t streamTimeStamp = _ConvertToStreamTimeBase(*time);
int index = av_index_search_timestamp(fStream, streamTimeStamp,
searchFlags);
- if (index >= 0) {
+ if (index < 0) {
+ TRACE(" av_index_search_timestamp() failed\n");
+ } else {
if (index > 0) {
const AVIndexEntry& entry =
fStream->index_entries[index];
streamTimeStamp = entry.timestamp;
@@ -582,7 +584,7 @@
// since when seeking back there will be later
index entries,
// but we still want to ignore the found entry.
fStreamBuildsIndexWhileReading = true;
- TRACE_FIND(" Not trusting generic index entry.
"
+ TRACE_SEEK(" Not trusting generic index entry.
"
"(Current count: %d)\n",
fStream->nb_index_entries);
} else {
// If we found a reasonably time, write it into
*time.
@@ -595,9 +597,23 @@
if (avformat_seek_file(fContext, -1, INT64_MIN, timeStamp,
INT64_MAX,
searchFlags) < 0) {
- TRACE(" avformat_seek_file()%s failed.\n", fSeekByBytes
- ? " (by bytes)" : "");
- return B_ERROR;
+ TRACE(" avformat_seek_file() failed.\n");
+ // Try to fall back to av_seek_frame()
+ timeStamp = _ConvertToStreamTimeBase(timeStamp);
+ if (av_seek_frame(fContext, fStream->index, timeStamp,
+ searchFlags) < 0) {
+ TRACE(" avformat_seek_frame() failed as
well.\n");
+ // Fall back to seeking to the beginning by
bytes
+ timeStamp = 0;
+ if (av_seek_frame(fContext, fStream->index,
timeStamp,
+ AVSEEK_FLAG_BYTE) < 0) {
+ TRACE(" avformat_seek_frame() by bytes
failed as "
+ "well.\n");
+ // Do not propagate error in any case.
We fail if we can't
+ // read another packet.
+ } else
+ *time = 0;
+ }
}
// Our last packet is toast in any case. Read the next one so
Other related posts:
- » [haiku-commits] r38853 - haiku/trunk/src/add-ons/media/plugins/ffmpeg - superstippi
