diff options
author | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-08 03:20:15 +0000 |
---|---|---|
committer | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-08 03:20:15 +0000 |
commit | a2c5dcd3c17d73acbac56bd01440470a5a40de66 (patch) | |
tree | f4b6ca800086d746c86c8d5e044221a522aa29e4 /ppapi/proxy/media_stream_track_resource_base.cc | |
parent | d5ab4fc6021a2a4d8dc8804a36885e9568fb877b (diff) | |
download | chromium_src-a2c5dcd3c17d73acbac56bd01440470a5a40de66.zip chromium_src-a2c5dcd3c17d73acbac56bd01440470a5a40de66.tar.gz chromium_src-a2c5dcd3c17d73acbac56bd01440470a5a40de66.tar.bz2 |
[PPAPI][MediaStream] Rename AudioFrame to AudioBuffer
For audio, a frame usually has the same meaning as sample,
so AudioFrame is not a good name for a bunch of audio
samples. Change it to AudioBuffer.
This CL only changes the name in base classes. The API
interface will be changed in a separate CL.
BUG=330851
Review URL: https://codereview.chromium.org/142023008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/media_stream_track_resource_base.cc')
-rw-r--r-- | ppapi/proxy/media_stream_track_resource_base.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ppapi/proxy/media_stream_track_resource_base.cc b/ppapi/proxy/media_stream_track_resource_base.cc index 73aa470..d259036 100644 --- a/ppapi/proxy/media_stream_track_resource_base.cc +++ b/ppapi/proxy/media_stream_track_resource_base.cc @@ -16,7 +16,7 @@ MediaStreamTrackResourceBase::MediaStreamTrackResourceBase( int pending_renderer_id, const std::string& id) : PluginResource(connection, instance), - frame_buffer_(this), + buffer_manager_(this), id_(id), has_ended_(false) { AttachToPendingHost(RENDERER, pending_renderer_id); @@ -25,11 +25,11 @@ MediaStreamTrackResourceBase::MediaStreamTrackResourceBase( MediaStreamTrackResourceBase::~MediaStreamTrackResourceBase() { } -void MediaStreamTrackResourceBase::SendEnqueueFrameMessageToHost( +void MediaStreamTrackResourceBase::SendEnqueueBufferMessageToHost( int32_t index) { DCHECK_GE(index, 0); - DCHECK_LT(index, frame_buffer()->number_of_frames()); - Post(RENDERER, PpapiHostMsg_MediaStreamTrack_EnqueueFrame(index)); + DCHECK_LT(index, buffer_manager()->number_of_buffers()); + Post(RENDERER, PpapiHostMsg_MediaStreamTrack_EnqueueBuffer(index)); } void MediaStreamTrackResourceBase::OnReplyReceived( @@ -37,9 +37,9 @@ void MediaStreamTrackResourceBase::OnReplyReceived( const IPC::Message& msg) { IPC_BEGIN_MESSAGE_MAP(MediaStreamTrackResourceBase, msg) PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL( - PpapiPluginMsg_MediaStreamTrack_InitFrames, OnPluginMsgInitFrames) + PpapiPluginMsg_MediaStreamTrack_InitBuffers, OnPluginMsgInitBuffers) PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL( - PpapiPluginMsg_MediaStreamTrack_EnqueueFrame, OnPluginMsgEnqueueFrame) + PpapiPluginMsg_MediaStreamTrack_EnqueueBuffer, OnPluginMsgEnqueueBuffer) PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL_UNHANDLED( PluginResource::OnReplyReceived(params, msg)) IPC_END_MESSAGE_MAP() @@ -52,21 +52,21 @@ void MediaStreamTrackResourceBase::CloseInternal() { } } -void MediaStreamTrackResourceBase::OnPluginMsgInitFrames( +void MediaStreamTrackResourceBase::OnPluginMsgInitBuffers( const ResourceMessageReplyParams& params, - int32_t number_of_frames, - int32_t frame_size) { + int32_t number_of_buffers, + int32_t buffer_size) { base::SharedMemoryHandle shm_handle = base::SharedMemory::NULLHandle(); params.TakeSharedMemoryHandleAtIndex(0, &shm_handle); - frame_buffer_.SetFrames(number_of_frames, frame_size, + buffer_manager_.SetBuffers(number_of_buffers, buffer_size, scoped_ptr<base::SharedMemory>(new base::SharedMemory(shm_handle, true)), false); } -void MediaStreamTrackResourceBase::OnPluginMsgEnqueueFrame( +void MediaStreamTrackResourceBase::OnPluginMsgEnqueueBuffer( const ResourceMessageReplyParams& params, int32_t index) { - frame_buffer_.EnqueueFrame(index); + buffer_manager_.EnqueueBuffer(index); } } // namespace proxy |