Merge 143765 - Ensure media's buffered ranges always have a range that includes currentTime.

media/tools/seek_tester/seek_tester.cc

 // Copyright (c) 2012 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.
 //
 // This standalone binary is a helper for diagnosing seek behavior of the
 // demuxer setup in media/ code.  It answers the question: "if I ask the demuxer
 // to Seek to X ms, where will it actually seek to? (necessitating
 // frame-dropping until the original seek target is reached)".  Sample run:
 //
 // $ ./out/Debug/seek_tester .../LayoutTests/media/content/test.ogv 6300
 // [0207/130327:INFO:seek_tester.cc(63)] Requested: 6123ms
 // [0207/130327:INFO:seek_tester.cc(68)]   audio seeked to: 5526ms
 // [0207/130327:INFO:seek_tester.cc(74)]   video seeked to: 5577ms
 
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "media/base/media.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/file_data_source.h"
 
 class DemuxerHostImpl : public media::DemuxerHost {
  public:
   // DataSourceHost implementation.
   virtual void SetTotalBytes(int64 total_bytes) OVERRIDE {}
   virtual void AddBufferedByteRange(int64 start, int64 end) OVERRIDE {}
+  virtual void AddBufferedTimeRange(base::TimeDelta start,
+                                    base::TimeDelta end) OVERRIDE {}
 
   // DemuxerHost implementation.
   virtual void SetDuration(base::TimeDelta duration) OVERRIDE {}
   virtual void OnDemuxerError(media::PipelineStatus error) OVERRIDE {}
 };
 
 void QuitMessageLoop(MessageLoop* loop, media::PipelineStatus status) {
   CHECK_EQ(status, media::PIPELINE_OK);
   loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
@@ skipping 48 matching lines @@
         base::Bind(&TimestampExtractor, &video_seeked_to_ms, &loop));
     loop.Run();
     LOG(INFO) << "  video seeked to: " << video_seeked_to_ms << "ms";
   }
 
   demuxer->Stop(base::Bind(&MessageLoop::Quit, base::Unretained(&loop)));
   loop.Run();
 
   return 0;
 }