| Index: ppapi/proxy/media_stream_video_track_resource.cc
|
| diff --git a/ppapi/proxy/media_stream_video_track_resource.cc b/ppapi/proxy/media_stream_video_track_resource.cc
|
| index 804df00d88f5d90b423f69cde2407190b338d93a..451f259caad37f16c5a99d036a5867c4e5c3c573 100644
|
| --- a/ppapi/proxy/media_stream_video_track_resource.cc
|
| +++ b/ppapi/proxy/media_stream_video_track_resource.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "ppapi/proxy/video_frame_resource.h"
|
| -#include "ppapi/shared_impl/media_stream_frame.h"
|
| +#include "ppapi/shared_impl/media_stream_buffer.h"
|
| #include "ppapi/shared_impl/var.h"
|
|
|
| namespace ppapi {
|
| @@ -84,9 +84,9 @@ int32_t MediaStreamVideoTrackResource::RecycleFrame(PP_Resource frame) {
|
| if (has_ended())
|
| return PP_OK;
|
|
|
| - DCHECK_GE(frame_resource->GetFrameBufferIndex(), 0);
|
| + DCHECK_GE(frame_resource->GetBufferIndex(), 0);
|
|
|
| - SendEnqueueFrameMessageToHost(frame_resource->GetFrameBufferIndex());
|
| + SendEnqueueBufferMessageToHost(frame_resource->GetBufferIndex());
|
| frame_resource->Invalidate();
|
| return PP_OK;
|
| }
|
| @@ -106,7 +106,7 @@ void MediaStreamVideoTrackResource::Close() {
|
| MediaStreamTrackResourceBase::CloseInternal();
|
| }
|
|
|
| -void MediaStreamVideoTrackResource::OnNewFrameEnqueued() {
|
| +void MediaStreamVideoTrackResource::OnNewBufferEnqueued() {
|
| if (!TrackedCallback::IsPending(get_frame_callback_))
|
| return;
|
|
|
| @@ -119,14 +119,14 @@ void MediaStreamVideoTrackResource::OnNewFrameEnqueued() {
|
| }
|
|
|
| PP_Resource MediaStreamVideoTrackResource::GetVideoFrame() {
|
| - int32_t index = frame_buffer()->DequeueFrame();
|
| + int32_t index = buffer_manager()->DequeueBuffer();
|
| if (index < 0)
|
| return 0;
|
|
|
| - MediaStreamFrame* frame = frame_buffer()->GetFramePointer(index);
|
| - DCHECK(frame);
|
| + MediaStreamBuffer* buffer = buffer_manager()->GetBufferPointer(index);
|
| + DCHECK(buffer);
|
| scoped_refptr<VideoFrameResource> resource =
|
| - new VideoFrameResource(pp_instance(), index, frame);
|
| + new VideoFrameResource(pp_instance(), index, buffer);
|
| // Add |pp_resource()| and |resource| into |frames_|.
|
| // |frames_| uses scoped_ptr<> to hold a ref of |resource|. It keeps the
|
| // resource alive.
|
|
|