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

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

Issue 1916923004: Request context sharing via content::ContextProviderCommandBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sharegroup: . Created 4 years, 7 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/webmediaplayer_ms_compositor.h" 5 #include "content/renderer/media/webmediaplayer_ms_compositor.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/hash.h" 11 #include "base/hash.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "cc/blink/context_provider_web_context.h" 14 #include "content/common/gpu/client/context_provider_command_buffer.h"
15 #include "content/renderer/media/webmediaplayer_ms.h" 15 #include "content/renderer/media/webmediaplayer_ms.h"
16 #include "content/renderer/render_thread_impl.h" 16 #include "content/renderer/render_thread_impl.h"
17 #include "media/base/media_switches.h" 17 #include "media/base/media_switches.h"
18 #include "media/base/video_frame.h" 18 #include "media/base/video_frame.h"
19 #include "media/base/video_util.h" 19 #include "media/base/video_util.h"
20 #include "media/filters/video_renderer_algorithm.h" 20 #include "media/filters/video_renderer_algorithm.h"
21 #include "media/renderers/skcanvas_video_renderer.h" 21 #include "media/renderers/skcanvas_video_renderer.h"
22 #include "skia/ext/platform_canvas.h" 22 #include "skia/ext/platform_canvas.h"
23 #include "third_party/WebKit/public/platform/WebMediaStream.h" 23 #include "third_party/WebKit/public/platform/WebMediaStream.h"
24 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 24 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
(...skipping 17 matching lines...) Expand all
42 frame->format() == media::PIXEL_FORMAT_UYVY || 42 frame->format() == media::PIXEL_FORMAT_UYVY ||
43 frame->format() == media::PIXEL_FORMAT_NV12); 43 frame->format() == media::PIXEL_FORMAT_NV12);
44 new_frame = media::VideoFrame::CreateFrame( 44 new_frame = media::VideoFrame::CreateFrame(
45 media::PIXEL_FORMAT_I420, frame->coded_size(), frame->visible_rect(), 45 media::PIXEL_FORMAT_I420, frame->coded_size(), frame->visible_rect(),
46 frame->natural_size(), frame->timestamp()); 46 frame->natural_size(), frame->timestamp());
47 SkBitmap bitmap; 47 SkBitmap bitmap;
48 bitmap.allocN32Pixels(frame->visible_rect().width(), 48 bitmap.allocN32Pixels(frame->visible_rect().width(),
49 frame->visible_rect().height()); 49 frame->visible_rect().height());
50 SkCanvas canvas(bitmap); 50 SkCanvas canvas(bitmap);
51 51
52 cc::ContextProvider* const provider = 52 auto* provider =
53 RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); 53 RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
54 if (provider) { 54 if (provider) {
55 const media::Context3D context_3d = 55 const media::Context3D context_3d =
56 media::Context3D(provider->ContextGL(), provider->GrContext()); 56 media::Context3D(provider->ContextGL(), provider->GrContext());
57 DCHECK(context_3d.gl); 57 DCHECK(context_3d.gl);
58 video_renderer->Copy(frame.get(), &canvas, context_3d); 58 video_renderer->Copy(frame.get(), &canvas, context_3d);
59 } else { 59 } else {
60 // GPU Process crashed. 60 // GPU Process crashed.
61 bitmap.eraseColor(SK_ColorTRANSPARENT); 61 bitmap.eraseColor(SK_ColorTRANSPARENT);
62 } 62 }
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 } 420 }
421 421
422 if (!rendering_frame_buffer_) { 422 if (!rendering_frame_buffer_) {
423 rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm( 423 rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm(
424 base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks, 424 base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks,
425 base::Unretained(this)))); 425 base::Unretained(this))));
426 } 426 }
427 } 427 }
428 428
429 } // namespace content 429 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.cc ('k') | content/renderer/pepper/video_decoder_shim.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698