1 files changed, 14 insertions, 13 deletions
diff --git a/ppapi/proxy/media_stream_track_resource_base.h b/ppapi/proxy/media_stream_track_resource_base.h
index 4a4aa3b..b5438ce 100644
--- a/ppapi/proxy/media_stream_track_resource_base.h
+++ b/ppapi/proxy/media_stream_track_resource_base.h
@@ -7,14 +7,14 @@
 
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
-#include "ppapi/shared_impl/media_stream_frame_buffer.h"
+#include "ppapi/shared_impl/media_stream_buffer_manager.h"
 
 namespace ppapi {
 namespace proxy {
 
 class PPAPI_PROXY_EXPORT MediaStreamTrackResourceBase
   : public PluginResource,
-    public MediaStreamFrameBuffer::Delegate {
+    public MediaStreamBufferManager::Delegate {
  protected:
   MediaStreamTrackResourceBase(Connection connection,
                                PP_Instance instance,
@@ -27,14 +27,15 @@ class PPAPI_PROXY_EXPORT MediaStreamTrackResourceBase
 
   bool has_ended() const { return has_ended_; }
 
-  MediaStreamFrameBuffer* frame_buffer() { return &frame_buffer_; }
+  MediaStreamBufferManager* buffer_manager() { return &buffer_manager_; }
 
   void CloseInternal();
 
-  // Sends a frame index to the corresponding PepperMediaStreamTrackHostBase
-  // via an IPC message. The host adds the frame index into its
-  // |frame_buffer_| for reading or writing. Also see |MediaStreamFrameBuffer|.
-  void SendEnqueueFrameMessageToHost(int32_t index);
+  // Sends a buffer index to the corresponding PepperMediaStreamTrackHostBase
+  // via an IPC message. The host adds the buffer index into its
+  // |buffer_manager_| for reading or writing.
+  // Also see |MediaStreamBufferManager|.
+  void SendEnqueueBufferMessageToHost(int32_t index);
 
   // PluginResource overrides:
   virtual void OnReplyReceived(const ResourceMessageReplyParams& params,
@@ -42,13 +43,13 @@ class PPAPI_PROXY_EXPORT MediaStreamTrackResourceBase
 
  private:
   // Message handlers:
-  void OnPluginMsgInitFrames(const ResourceMessageReplyParams& params,
-                             int32_t number_of_frames,
-                             int32_t frame_size);
-  void OnPluginMsgEnqueueFrame(const ResourceMessageReplyParams& params,
-                               int32_t index);
+  void OnPluginMsgInitBuffers(const ResourceMessageReplyParams& params,
+                              int32_t number_of_buffers,
+                              int32_t buffer_size);
+  void OnPluginMsgEnqueueBuffer(const ResourceMessageReplyParams& params,
+                                int32_t index);
 
-  MediaStreamFrameBuffer frame_buffer_;
+  MediaStreamBufferManager buffer_manager_;
 
   std::string id_;