[PPAPI] Pepper MediaStream API audio track implementation and example.

ppapi/proxy/media_stream_audio_track_resource.cc

Index: ppapi/proxy/media_stream_audio_track_resource.cc
diff --git a/ppapi/proxy/media_stream_video_track_resource.cc b/ppapi/proxy/media_stream_audio_track_resource.cc
similarity index 56%
copy from ppapi/proxy/media_stream_video_track_resource.cc
copy to ppapi/proxy/media_stream_audio_track_resource.cc
index 0b76fb8c45704ab600b4f152c73b9bee9c38c157..798fd07dbf1f4919d7c9c9accc4fc27d7e2fe8d1 100644
--- a/ppapi/proxy/media_stream_video_track_resource.cc
+++ b/ppapi/proxy/media_stream_audio_track_resource.cc
@@ -1,18 +1,17 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2014 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 "ppapi/proxy/media_stream_video_track_resource.h"
+#include "ppapi/proxy/media_stream_audio_track_resource.h"
 
-#include "base/logging.h"
-#include "ppapi/proxy/video_frame_resource.h"
+#include "ppapi/proxy/audio_frame_resource.h"
 #include "ppapi/shared_impl/media_stream_frame.h"
 #include "ppapi/shared_impl/var.h"
 
 namespace ppapi {
 namespace proxy {
 
-MediaStreamVideoTrackResource::MediaStreamVideoTrackResource(
+MediaStreamAudioTrackResource::MediaStreamAudioTrackResource(
     Connection connection,
     PP_Instance instance,
     int pending_renderer_id,
@@ -22,30 +21,30 @@ MediaStreamVideoTrackResource::MediaStreamVideoTrackResource(
       get_frame_output_(NULL) {
 }
 
-MediaStreamVideoTrackResource::~MediaStreamVideoTrackResource() {
+MediaStreamAudioTrackResource::~MediaStreamAudioTrackResource() {
   Close();
 }
 
-thunk::PPB_MediaStreamVideoTrack_API*
-MediaStreamVideoTrackResource::AsPPB_MediaStreamVideoTrack_API() {
+thunk::PPB_MediaStreamAudioTrack_API*
+MediaStreamAudioTrackResource::AsPPB_MediaStreamAudioTrack_API() {
   return this;
 }
 
-PP_Var MediaStreamVideoTrackResource::GetId() {
+PP_Var MediaStreamAudioTrackResource::GetId() {
   return StringVar::StringToPPVar(id());
 }
 
-PP_Bool MediaStreamVideoTrackResource::HasEnded() {
+PP_Bool MediaStreamAudioTrackResource::HasEnded() {
   return PP_FromBool(has_ended());
 }
 
-int32_t MediaStreamVideoTrackResource::Configure(uint32_t max_buffered_frames) {
-  // TODO(penghuang): redesign and implement Configure() to support format,
-  // size, etc.
+int32_t MediaStreamAudioTrackResource::Configure(uint32_t samples_per_frame,
+                                                 uint32_t max_buffered_frames) {
+  // TODO(penghuang): Implement Configure().
   return PP_ERROR_NOTSUPPORTED;
 }
 
-int32_t MediaStreamVideoTrackResource::GetFrame(
+int32_t MediaStreamAudioTrackResource::GetFrame(
     PP_Resource* frame,
     scoped_refptr<TrackedCallback> callback) {
   if (has_ended())
@@ -54,7 +53,7 @@ int32_t MediaStreamVideoTrackResource::GetFrame(
   if (TrackedCallback::IsPending(get_frame_callback_))
     return PP_ERROR_INPROGRESS;
 
-  *frame = GetVideoFrame();
+  *frame = GetAudioFrame(-1);
   if (*frame)
     return PP_OK;
 
@@ -63,25 +62,25 @@ int32_t MediaStreamVideoTrackResource::GetFrame(
   return PP_OK_COMPLETIONPENDING;
 }
 
-int32_t MediaStreamVideoTrackResource::RecycleFrame(PP_Resource frame) {
+int32_t MediaStreamAudioTrackResource::RecycleFrame(PP_Resource frame) {
   FrameMap::iterator it = frames_.find(frame);
   if (it == frames_.end())
     return PP_ERROR_BADRESOURCE;
 
-  scoped_refptr<VideoFrameResource> frame_resource = it->second;
+  scoped_refptr<AudioFrameResource> frame_resource = it->second;
   frames_.erase(it);
 
   if (has_ended())
     return PP_OK;
 
-  DCHECK_GE(frame_resource->GetFrameBufferIndex(), 0);
+  DCHECK(frame_resource->GetFrameBufferIndex() >= 0);
 
   SendEnqueueFrameMessageToHost(frame_resource->GetFrameBufferIndex());
   frame_resource->Invalidate();
   return PP_OK;
 }
 
-void MediaStreamVideoTrackResource::Close() {
+void MediaStreamAudioTrackResource::Close() {
   if (has_ended())
     return;
 
@@ -96,23 +95,29 @@ void MediaStreamVideoTrackResource::Close() {
   MediaStreamTrackResourceBase::CloseInternal();
 }
 
-void MediaStreamVideoTrackResource::OnNewFrameEnqueued() {
-  if (TrackedCallback::IsPending(get_frame_callback_)) {
-    *get_frame_output_ = GetVideoFrame();
-    get_frame_output_ = NULL;
-    scoped_refptr<TrackedCallback> callback;
-    callback.swap(get_frame_callback_);
-    callback->Run(PP_OK);
-  }
+bool MediaStreamAudioTrackResource::OnNewFramePreEnqueued(int32_t index) {
+  if (!TrackedCallback::IsPending(get_frame_callback_))
+    return false;
+
+  *get_frame_output_ = GetAudioFrame(index);
+  get_frame_output_ = NULL;
+  scoped_refptr<TrackedCallback> callback;
+  callback.swap(get_frame_callback_);
+  callback->Run(PP_OK);
+  return true;
 }
 
-PP_Resource MediaStreamVideoTrackResource::GetVideoFrame() {
-  int32_t index = frame_buffer()->DequeueFrame();
-  if (index < 0)
-    return 0;
+PP_Resource MediaStreamAudioTrackResource::GetAudioFrame(int32_t index) {
+  if (index < 0) {
+    index = frame_buffer()->DequeueFrame();
+    if (index < 0)
+      return 0;
+  }
+
   MediaStreamFrame* frame = frame_buffer()->GetFramePointer(index);
-  scoped_refptr<VideoFrameResource> resource =
-      new VideoFrameResource(pp_instance(), index, frame);
+  DCHECK(frame);
+  scoped_refptr<AudioFrameResource> resource =
+      new AudioFrameResource(pp_instance(), index, frame);
   // Add |pp_resource()| and |resource| into |frames_|.
   // |frames_| uses scoped_ptr<> to hold a ref of |resource|. It keeps the
   // resource alive.
@@ -120,7 +125,7 @@ PP_Resource MediaStreamVideoTrackResource::GetVideoFrame() {
   return resource->GetReference();
 }
 
-void MediaStreamVideoTrackResource::ReleaseFrames() {
+void MediaStreamAudioTrackResource::ReleaseFrames() {
   FrameMap::iterator it = frames_.begin();
   while (it != frames_.end()) {
     // Just invalidate and release VideoFrameResorce, but keep PP_Resource.