Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1708)

Side by Side Diff: content/renderer/media/media_stream_video_renderer_sink.cc

Issue 2386693004: Disable GpuMemoryBuffer backed VideoFrames in media streams (Closed)
Patch Set: Add base::Feature which is disabled by default. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/public/common/content_features.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_stream_video_renderer_sink.h" 5 #include "content/renderer/media/media_stream_video_renderer_sink.h"
6 6
7 #include "base/feature_list.h"
7 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
8 #include "base/threading/thread_task_runner_handle.h" 9 #include "base/threading/thread_task_runner_handle.h"
9 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
11 #include "content/public/common/content_features.h"
10 #include "media/base/bind_to_current_loop.h" 12 #include "media/base/bind_to_current_loop.h"
11 #include "media/base/video_frame.h" 13 #include "media/base/video_frame.h"
12 #include "media/base/video_frame_metadata.h" 14 #include "media/base/video_frame_metadata.h"
13 #include "media/base/video_util.h" 15 #include "media/base/video_util.h"
14 #include "media/renderers/gpu_video_accelerator_factories.h" 16 #include "media/renderers/gpu_video_accelerator_factories.h"
15 17
16 const int kMinFrameSize = 2; 18 const int kMinFrameSize = 2;
17 19
18 namespace content { 20 namespace content {
19 21
20 MediaStreamVideoRendererSink::MediaStreamVideoRendererSink( 22 MediaStreamVideoRendererSink::MediaStreamVideoRendererSink(
21 const blink::WebMediaStreamTrack& video_track, 23 const blink::WebMediaStreamTrack& video_track,
22 const base::Closure& error_cb, 24 const base::Closure& error_cb,
23 const RepaintCB& repaint_cb, 25 const RepaintCB& repaint_cb,
24 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 26 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
25 const scoped_refptr<base::TaskRunner>& worker_task_runner, 27 const scoped_refptr<base::TaskRunner>& worker_task_runner,
26 media::GpuVideoAcceleratorFactories* gpu_factories) 28 media::GpuVideoAcceleratorFactories* gpu_factories)
27 : error_cb_(error_cb), 29 : error_cb_(error_cb),
28 repaint_cb_(repaint_cb), 30 repaint_cb_(repaint_cb),
29 task_runner_(base::ThreadTaskRunnerHandle::Get()), 31 task_runner_(base::ThreadTaskRunnerHandle::Get()),
30 state_(STOPPED), 32 state_(STOPPED),
31 frame_size_(kMinFrameSize, kMinFrameSize), 33 frame_size_(kMinFrameSize, kMinFrameSize),
32 video_track_(video_track), 34 video_track_(video_track),
33 media_task_runner_(media_task_runner), 35 media_task_runner_(media_task_runner),
34 weak_factory_(this) { 36 weak_factory_(this) {
35 if (gpu_factories && 37 if (gpu_factories &&
36 gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) { 38 gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames() &&
39 base::FeatureList::IsEnabled(
40 features::kWebRtcUseGpuMemoryBufferVideoFrames)) {
37 gpu_memory_buffer_pool_.reset(new media::GpuMemoryBufferVideoFramePool( 41 gpu_memory_buffer_pool_.reset(new media::GpuMemoryBufferVideoFramePool(
38 media_task_runner, worker_task_runner, gpu_factories)); 42 media_task_runner, worker_task_runner, gpu_factories));
39 } 43 }
40 } 44 }
41 45
42 MediaStreamVideoRendererSink::~MediaStreamVideoRendererSink() { 46 MediaStreamVideoRendererSink::~MediaStreamVideoRendererSink() {
43 if (gpu_memory_buffer_pool_) { 47 if (gpu_memory_buffer_pool_) {
44 media_task_runner_->DeleteSoon(FROM_HERE, 48 media_task_runner_->DeleteSoon(FROM_HERE,
45 gpu_memory_buffer_pool_.release()); 49 gpu_memory_buffer_pool_.release());
46 } 50 }
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 scoped_refptr<media::VideoFrame> video_frame = 151 scoped_refptr<media::VideoFrame> video_frame =
148 media::VideoFrame::CreateBlackFrame(frame_size_); 152 media::VideoFrame::CreateBlackFrame(frame_size_);
149 video_frame->metadata()->SetBoolean(media::VideoFrameMetadata::END_OF_STREAM, 153 video_frame->metadata()->SetBoolean(media::VideoFrameMetadata::END_OF_STREAM,
150 true); 154 true);
151 video_frame->metadata()->SetTimeTicks( 155 video_frame->metadata()->SetTimeTicks(
152 media::VideoFrameMetadata::REFERENCE_TIME, base::TimeTicks::Now()); 156 media::VideoFrameMetadata::REFERENCE_TIME, base::TimeTicks::Now());
153 OnVideoFrame(video_frame, base::TimeTicks()); 157 OnVideoFrame(video_frame, base::TimeTicks());
154 } 158 }
155 159
156 } // namespace content 160 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_features.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698