[PPAPI][MediaStream] Rename AudioFrame to AudioBuffer

ppapi/shared_impl/media_stream_buffer_manager.cc

Index: ppapi/shared_impl/media_stream_buffer_manager.cc
diff --git a/ppapi/shared_impl/media_stream_frame_buffer.cc b/ppapi/shared_impl/media_stream_buffer_manager.cc
similarity index 30%
rename from ppapi/shared_impl/media_stream_frame_buffer.cc
rename to ppapi/shared_impl/media_stream_buffer_manager.cc
index 624883039ecb881504d6b9aa33b0e6adbe6538cb..b0588d6df4832540677c8b52fba39ac57610a762 100644
--- a/ppapi/shared_impl/media_stream_frame_buffer.cc
+++ b/ppapi/shared_impl/media_stream_buffer_manager.cc
@@ -2,77 +2,79 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ppapi/shared_impl/media_stream_frame_buffer.h"
+#include "ppapi/shared_impl/media_stream_buffer_manager.h"
 
 #include "base/logging.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/shared_impl/media_stream_buffer.h"
 
 namespace ppapi {
 
-MediaStreamFrameBuffer::Delegate::~Delegate() {}
+MediaStreamBufferManager::Delegate::~Delegate() {}
 
-void MediaStreamFrameBuffer::Delegate::OnNewFrameEnqueued() {
+void MediaStreamBufferManager::Delegate::OnNewBufferEnqueued() {
 }
 
-MediaStreamFrameBuffer::MediaStreamFrameBuffer(Delegate* delegate)
+MediaStreamBufferManager::MediaStreamBufferManager(Delegate* delegate)
    : delegate_(delegate),
-     frame_size_(0),
-     number_of_frames_(0) {
+     buffer_size_(0),
+     number_of_buffers_(0) {
   DCHECK(delegate_);
 }
 
-MediaStreamFrameBuffer::~MediaStreamFrameBuffer() {
+MediaStreamBufferManager::~MediaStreamBufferManager() {
 }
 
-bool MediaStreamFrameBuffer::SetFrames(
-    int32_t number_of_frames,
-    int32_t frame_size,
+bool MediaStreamBufferManager::SetBuffers(
+    int32_t number_of_buffers,
+    int32_t buffer_size,
     scoped_ptr<base::SharedMemory> shm,
-    bool enqueue_all_frames) {
+    bool enqueue_all_buffers) {
   DCHECK(shm);
   DCHECK(!shm_);
-  DCHECK_GT(number_of_frames, 0);
-  DCHECK_GT(frame_size, static_cast<int32_t>(sizeof(MediaStreamFrame::Header)));
-  DCHECK_EQ(frame_size & 0x3, 0);
+  DCHECK_GT(number_of_buffers, 0);
+  DCHECK_GT(buffer_size,
+            static_cast<int32_t>(sizeof(MediaStreamBuffer::Header)));
+  DCHECK_EQ(buffer_size & 0x3, 0);
 
-  number_of_frames_ = number_of_frames;
-  frame_size_ = frame_size;
+  number_of_buffers_ = number_of_buffers;
+  buffer_size_ = buffer_size;
 
-  int32_t size = number_of_frames_ * frame_size;
+  int32_t size = number_of_buffers_ * buffer_size;
   shm_ = shm.Pass();
   if (!shm_->Map(size))
     return false;
 
   uint8_t* p = reinterpret_cast<uint8_t*>(shm_->memory());
-  for (int32_t i = 0; i < number_of_frames; ++i) {
-    if (enqueue_all_frames)
-      frame_queue_.push_back(i);
-    frames_.push_back(reinterpret_cast<MediaStreamFrame*>(p));
-    p += frame_size_;
+  for (int32_t i = 0; i < number_of_buffers; ++i) {
+    if (enqueue_all_buffers)
+      buffer_queue_.push_back(i);
+    buffers_.push_back(reinterpret_cast<MediaStreamBuffer*>(p));
+    p += buffer_size_;
   }
   return true;
 }
 
-int32_t MediaStreamFrameBuffer::DequeueFrame() {
-  if (frame_queue_.empty())
+int32_t MediaStreamBufferManager::DequeueBuffer() {
+  if (buffer_queue_.empty())
     return PP_ERROR_FAILED;
-  int32_t frame = frame_queue_.front();
-  frame_queue_.pop_front();
-  return frame;
+  int32_t buffer = buffer_queue_.front();
+  buffer_queue_.pop_front();
+  return buffer;
 }
 
-void MediaStreamFrameBuffer::EnqueueFrame(int32_t index) {
+void MediaStreamBufferManager::EnqueueBuffer(int32_t index) {
   DCHECK_GE(index, 0);
-  DCHECK_LT(index, number_of_frames_);
-  frame_queue_.push_back(index);
-  delegate_->OnNewFrameEnqueued();
+  DCHECK_LT(index, number_of_buffers_);
+  buffer_queue_.push_back(index);
+  delegate_->OnNewBufferEnqueued();
 }
 
-MediaStreamFrame* MediaStreamFrameBuffer::GetFramePointer(
+MediaStreamBuffer* MediaStreamBufferManager::GetBufferPointer(
     int32_t index) {
   DCHECK_GE(index, 0);
-  DCHECK_LT(index, number_of_frames_);
-  return frames_[index];
+  DCHECK_LT(index, number_of_buffers_);
+  return buffers_[index];
 }
 
 }  // namespace ppapi