media: split GpuMemoryBufferVideoFramePool into GpuMemoryBufferVideoFrameCopier/Pool

content/renderer/media/media_stream_video_renderer_sink.cc

 // Copyright (c) 2012 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 "content/renderer/media/media_stream_video_renderer_sink.h"
 
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "media/base/bind_to_current_loop.h"
@@ skipping 16 matching lines @@
     : error_cb_(error_cb),
       repaint_cb_(repaint_cb),
       task_runner_(base::ThreadTaskRunnerHandle::Get()),
       state_(STOPPED),
       frame_size_(kMinFrameSize, kMinFrameSize),
       video_track_(video_track),
       media_task_runner_(media_task_runner),
       weak_factory_(this) {
   if (gpu_factories &&
       gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) {
-    gpu_memory_buffer_pool_.reset(new media::GpuMemoryBufferVideoFramePool(
+    gpu_memory_buffer_copier_.reset(new media::GpuMemoryBufferVideoFrameCopier(
         media_task_runner, worker_task_runner, gpu_factories));
   }
 }
 
 MediaStreamVideoRendererSink::~MediaStreamVideoRendererSink() {
-  if (gpu_memory_buffer_pool_) {
+  if (gpu_memory_buffer_copier_) {
     media_task_runner_->DeleteSoon(FROM_HERE,
-                                   gpu_memory_buffer_pool_.release());
+                                   gpu_memory_buffer_copier_.release());
   }
 }
 
 void MediaStreamVideoRendererSink::Start() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, STOPPED);
 
   MediaStreamVideoSink::ConnectToTrack(video_track_,
       media::BindToCurrentLoop(
           base::Bind(
@@ skipping 24 matching lines @@
     state_ = STARTED;
 }
 
 void MediaStreamVideoRendererSink::Pause() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   if (state_ == STARTED)
     state_ = PAUSED;
 }
 
 void MediaStreamVideoRendererSink::SetGpuMemoryBufferVideoForTesting(
-    media::GpuMemoryBufferVideoFramePool* gpu_memory_buffer_pool) {
-  gpu_memory_buffer_pool_.reset(gpu_memory_buffer_pool);
+    media::GpuMemoryBufferVideoFrameCopier* gpu_memory_buffer_copier) {
+  gpu_memory_buffer_copier_.reset(gpu_memory_buffer_copier);
 }
 
 void MediaStreamVideoRendererSink::OnReadyStateChanged(
     blink::WebMediaStreamSource::ReadyState state) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   if (state == blink::WebMediaStreamSource::ReadyStateEnded)
     RenderSignalingFrame();
 }
 
 void MediaStreamVideoRendererSink::OnVideoFrame(
     const scoped_refptr<media::VideoFrame>& frame,
     base::TimeTicks estimated_capture_time) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(frame);
   if (state_ != STARTED)
     return;
 
-  if (!gpu_memory_buffer_pool_) {
+  if (!gpu_memory_buffer_copier_) {
     FrameReady(frame);
     return;
   }
 
-  //  |gpu_memory_buffer_pool_| deletion is going to be posted to
+  //  |gpu_memory_buffer_copier_| deletion is going to be posted to
   //  |media_task_runner_|. base::Unretained() usage is fine since
-  //  |gpu_memory_buffer_pool_| outlives the task.
+  //  |gpu_memory_buffer_copier_| outlives the task.
   media_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(
-          &media::GpuMemoryBufferVideoFramePool::MaybeCreateHardwareFrame,
-          base::Unretained(gpu_memory_buffer_pool_.get()), frame,
+          &media::GpuMemoryBufferVideoFrameCopier::MaybeCreateHardwareFrame,
+          base::Unretained(gpu_memory_buffer_copier_.get()), frame,
           media::BindToCurrentLoop(
               base::Bind(&MediaStreamVideoRendererSink::FrameReady,
                          weak_factory_.GetWeakPtr()))));
 }
 
 void MediaStreamVideoRendererSink::FrameReady(
     const scoped_refptr<media::VideoFrame>& frame) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(frame);
 
@@ skipping 14 matching lines @@
   scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::CreateBlackFrame(frame_size_);
   video_frame->metadata()->SetBoolean(media::VideoFrameMetadata::END_OF_STREAM,
                                       true);
   video_frame->metadata()->SetTimeTicks(
       media::VideoFrameMetadata::REFERENCE_TIME, base::TimeTicks::Now());
   OnVideoFrame(video_frame, base::TimeTicks());
 }
 
 }  // namespace content