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

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

Issue 2442273002: cl for resolving cq issues
Patch Set: rtebase Created 3 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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.h" 5 #include "content/renderer/media/webmediaplayer_ms.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 return false; 597 return false;
598 context_3d = media::Context3D(provider->ContextGL(), provider->GrContext()); 598 context_3d = media::Context3D(provider->ContextGL(), provider->GrContext());
599 DCHECK(context_3d.gl); 599 DCHECK(context_3d.gl);
600 return video_renderer_.CopyVideoFrameTexturesToGLTexture( 600 return video_renderer_.CopyVideoFrameTexturesToGLTexture(
601 context_3d, gl, video_frame.get(), texture, premultiply_alpha, flip_y); 601 context_3d, gl, video_frame.get(), texture, premultiply_alpha, flip_y);
602 } 602 }
603 603
604 bool WebMediaPlayerMS::TexImageImpl(TexImageFunctionID functionID, 604 bool WebMediaPlayerMS::TexImageImpl(TexImageFunctionID functionID,
605 unsigned target, 605 unsigned target,
606 gpu::gles2::GLES2Interface* gl, 606 gpu::gles2::GLES2Interface* gl,
607 unsigned int texture,
607 int level, 608 int level,
608 int internalformat, 609 int internalformat,
609 unsigned format, 610 unsigned format,
610 unsigned type, 611 unsigned type,
611 int xoffset, 612 int xoffset,
612 int yoffset, 613 int yoffset,
613 int zoffset, 614 int zoffset,
614 bool flip_y, 615 bool flip_y,
615 bool premultiply_alpha) { 616 bool premultiply_alpha) {
616 TRACE_EVENT0("media", "WebMediaPlayerMS:texImageImpl"); 617 TRACE_EVENT0("media", "WebMediaPlayerMS:texImageImpl");
617 DCHECK(thread_checker_.CalledOnValidThread()); 618 DCHECK(thread_checker_.CalledOnValidThread());
618 619
619 const scoped_refptr<media::VideoFrame> video_frame = 620 const scoped_refptr<media::VideoFrame> video_frame =
620 compositor_->GetCurrentFrameWithoutUpdatingStatistics(); 621 compositor_->GetCurrentFrameWithoutUpdatingStatistics();
621 if (!video_frame || !video_frame->IsMappable() || 622 if (!video_frame || !video_frame->IsMappable() ||
622 video_frame->HasTextures() || 623 video_frame->HasTextures() ||
623 video_frame->format() != media::PIXEL_FORMAT_Y16) { 624 video_frame->format() != media::PIXEL_FORMAT_Y16) {
624 return false; 625 return false;
625 } 626 }
626 627
627 if (functionID == kTexImage2D) { 628 if (functionID == kTexImage2D) {
629 auto* provider =
630 RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
631 // GPU Process crashed.
632 if (!provider)
633 return false;
628 return media::SkCanvasVideoRenderer::TexImage2D( 634 return media::SkCanvasVideoRenderer::TexImage2D(
629 target, gl, video_frame.get(), level, internalformat, format, type, 635 target, texture, gl, provider->ContextCapabilities(), video_frame.get(),
630 flip_y, premultiply_alpha); 636 level, internalformat, format, type, flip_y, premultiply_alpha);
631 } else if (functionID == kTexSubImage2D) { 637 } else if (functionID == kTexSubImage2D) {
632 return media::SkCanvasVideoRenderer::TexSubImage2D( 638 return media::SkCanvasVideoRenderer::TexSubImage2D(
633 target, gl, video_frame.get(), level, format, type, xoffset, yoffset, 639 target, gl, video_frame.get(), level, format, type, xoffset, yoffset,
634 flip_y, premultiply_alpha); 640 flip_y, premultiply_alpha);
635 } 641 }
636 return false; 642 return false;
637 } 643 }
638 644
639 void WebMediaPlayerMS::OnFirstFrameReceived(media::VideoRotation video_rotation, 645 void WebMediaPlayerMS::OnFirstFrameReceived(media::VideoRotation video_rotation,
640 bool is_opaque) { 646 bool is_opaque) {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
703 void WebMediaPlayerMS::ResetCanvasCache() { 709 void WebMediaPlayerMS::ResetCanvasCache() {
704 DCHECK(thread_checker_.CalledOnValidThread()); 710 DCHECK(thread_checker_.CalledOnValidThread());
705 video_renderer_.ResetCache(); 711 video_renderer_.ResetCache();
706 } 712 }
707 713
708 void WebMediaPlayerMS::TriggerResize() { 714 void WebMediaPlayerMS::TriggerResize() {
709 get_client()->SizeChanged(); 715 get_client()->SizeChanged();
710 } 716 }
711 717
712 } // namespace content 718 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.h ('k') | content/test/data/media/depth_stream_test_utilities.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698