Merge 21611 - Implemented proper pausethenseek behaviour for the media pipeli...

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "media/base/filter_host.h"
 #include "media/filters/ffmpeg_common.h"
@@ skipping 121 matching lines @@
     NOTREACHED() << "Unable to allocate AVPacketBuffer";
     return timestamp;
   }
   buffer_queue_.push_back(buffer);
   FulfillPendingRead();
   return timestamp;
 }
 
 void FFmpegDemuxerStream::FlushBuffers() {
   DCHECK_EQ(MessageLoop::current(), demuxer_->message_loop());
+  DCHECK(read_queue_.empty()) << "Read requests should be empty";
   buffer_queue_.clear();
   discontinuous_ = true;
 }
 
 void FFmpegDemuxerStream::Stop() {
   DCHECK_EQ(MessageLoop::current(), demuxer_->message_loop());
   buffer_queue_.clear();
   STLDeleteElements(&read_queue_);
   stopped_ = true;
 }
@@ skipping 271 matching lines @@
   for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
     (*iter)->FlushBuffers();
   }
 
   // Seek backwards if requested timestamp is behind FFmpeg's current time.
   int flags = 0;
   if (time <= current_timestamp_) {
     flags |= AVSEEK_FLAG_BACKWARD;
   }
 
-  if (av_seek_frame(format_context_, -1, time.InMicroseconds(),
-                    flags) < 0) {
+  // Passing -1 as our stream index lets FFmpeg pick a default stream.  FFmpeg
+  // will attempt to use the lowest-index video stream, if present, followed by
+  // the lowest-index audio stream.
+  if (av_seek_frame(format_context_, -1, time.InMicroseconds(), flags) < 0) {
     // TODO(scherkus): signal error.
     NOTIMPLEMENTED();
   }
 
   // Notify we're finished seeking.
   callback->Run();
 }
 
 void FFmpegDemuxer::DemuxTask() {
   DCHECK_EQ(MessageLoop::current(), message_loop());
@@ skipping 89 matching lines @@
   read_event_.Wait();
   return last_read_bytes_;
 }
 
 void FFmpegDemuxer::SignalReadCompleted(size_t size) {
   last_read_bytes_ = size;
   read_event_.Signal();
 }
 
 }  // namespace media