Merge 105121 - Numerous fixes to audio/video buffered resource loading.

webkit/glue/media/buffered_data_source.h

 // Copyright (c) 2011 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.
 
 #ifndef WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_
 #define WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 32 matching lines @@
   virtual void SetPlaybackRate(float playback_rate);
 
   // media::DataSource implementation.
   // Called from demuxer thread.
   virtual void Read(int64 position, size_t size,
                     uint8* data,
                     media::DataSource::ReadCallback* read_callback);
   virtual bool GetSize(int64* size_out);
   virtual bool IsStreaming();
   virtual void SetPreload(media::Preload preload);
+  virtual void SetBitrate(int bitrate);
 
   // webkit_glue::WebDataSource implementation.
   virtual void Initialize(const std::string& url,
                           const media::PipelineStatusCB& callback);
   virtual void CancelInitialize();
   virtual bool HasSingleOrigin();
   virtual void Abort();
 
  protected:
   // A factory method to create a BufferedResourceLoader based on the read
   // parameters. We can override this file to object a mock
   // BufferedResourceLoader for testing.
   virtual BufferedResourceLoader* CreateResourceLoader(
       int64 first_byte_position, int64 last_byte_position);
 
  private:
+  friend class BufferedDataSourceTest2;
+
   // Posted to perform initialization on render thread and start resource
   // loading.
   void InitializeTask();
 
   // Task posted to perform actual reading on the render thread.
   void ReadTask(int64 position, int read_size, uint8* read_buffer);
 
   // Task posted when Stop() is called. Stops |watch_dog_timer_| and
   // |loader_|, reset Read() variables, and set |stopped_on_render_loop_|
   // to signal any remaining tasks to stop.
   void CleanupTask();
 
   // Restart resource loading on render thread.
   void RestartLoadingTask();
 
   // This task uses the current playback rate with the previous playback rate
   // to determine whether we are going from pause to play and play to pause,
   // and signals the buffered resource loader accordingly.
   void SetPlaybackRateTask(float playback_rate);
 
   // This task saves the preload value for the media.
   void SetPreloadTask(media::Preload preload);
 
+  // Tells |loader_| the bitrate of the media.
+  void SetBitrateTask(int bitrate);
+
   // Decides which DeferStrategy to used based on the current state of the
   // BufferedDataSource.
   BufferedResourceLoader::DeferStrategy ChooseDeferStrategy();
 
   // The method that performs actual read. This method can only be executed on
   // the render thread.
   void ReadInternal();
 
   // Calls |read_callback_| and reset all read parameters.
   void DoneRead_Locked(int error);
@@ skipping 102 matching lines @@
   // element.
   media::Preload preload_;
 
   // Keeps track of whether we used a Range header in the initialization
   // request.
   bool using_range_request_;
 
   // Number of cache miss retries left.
   int cache_miss_retries_left_;
 
+  // Bitrate of the content, 0 if unknown.
+  int bitrate_;
+
+  // Current playback rate.
+  float playback_rate_;
+
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_