Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 593 // GPU Process crashed. | 593 // GPU Process crashed. |
| 594 if (!provider) | 594 if (!provider) |
| 595 return false; | 595 return false; |
| 596 context_3d = media::Context3D(provider->ContextGL(), provider->GrContext()); | 596 context_3d = media::Context3D(provider->ContextGL(), provider->GrContext()); |
| 597 DCHECK(context_3d.gl); | 597 DCHECK(context_3d.gl); |
| 598 return video_renderer_.CopyVideoFrameTexturesToGLTexture( | 598 return video_renderer_.CopyVideoFrameTexturesToGLTexture( |
| 599 context_3d, gl, video_frame.get(), texture, internal_format, type, | 599 context_3d, gl, video_frame.get(), texture, internal_format, type, |
| 600 premultiply_alpha, flip_y); | 600 premultiply_alpha, flip_y); |
| 601 } | 601 } |
| 602 | 602 |
| 603 bool WebMediaPlayerMS::texImageImpl(TexImageFunctionID functionID, | |
| 604 unsigned target, | |
| 605 gpu::gles2::GLES2Interface* gl, | |
| 606 int level, | |
| 607 int internalformat, | |
| 608 unsigned format, | |
| 609 unsigned type, | |
| 610 int xoffset, | |
| 611 int yoffset, | |
| 612 int zoffset, | |
| 613 bool flip_y, | |
| 614 bool premultiply_alpha) { | |
| 615 TRACE_EVENT0("media", "WebMediaPlayerMS:texImageImpl"); | |
| 616 DCHECK(thread_checker_.CalledOnValidThread()); | |
| 617 | |
| 618 const scoped_refptr<media::VideoFrame> video_frame = | |
| 619 compositor_->GetCurrentFrameWithoutUpdatingStatistics(); | |
| 620 if (!video_frame || !video_frame->IsMappable() || | |
| 621 video_frame->HasTextures() || | |
| 622 media::VideoFrame::NumPlanes(video_frame->format()) != 1) { | |
|
emircan
2016/12/01 23:23:37
Should you just check for PIXEL_FORMAT_Y16 format
aleksandar.stojiljkovic
2016/12/02 20:23:41
Done.
The idea is to use this to optimize for Y8 t
emircan
2016/12/02 20:33:34
Thanks for the explanation. For media streams, we
| |
| 623 return false; | |
| 624 } | |
| 625 | |
| 626 if (functionID == TexImage2D) { | |
| 627 return media::SkCanvasVideoRenderer::TexImage2D( | |
| 628 target, gl, video_frame.get(), level, internalformat, format, type, | |
| 629 flip_y, premultiply_alpha); | |
| 630 } else if (functionID == TexSubImage2D) { | |
| 631 return media::SkCanvasVideoRenderer::TexSubImage2D( | |
| 632 target, gl, video_frame.get(), level, format, type, xoffset, yoffset, | |
| 633 flip_y, premultiply_alpha); | |
| 634 } | |
|
emircan
2016/12/01 23:23:37
nit: If you don't expect this function to be calle
aleksandar.stojiljkovic
2016/12/02 20:23:41
Other parameter values are expected too, we just d
| |
| 635 return false; | |
| 636 } | |
| 637 | |
| 603 void WebMediaPlayerMS::OnFirstFrameReceived(media::VideoRotation video_rotation, | 638 void WebMediaPlayerMS::OnFirstFrameReceived(media::VideoRotation video_rotation, |
| 604 bool is_opaque) { | 639 bool is_opaque) { |
| 605 DVLOG(1) << __func__; | 640 DVLOG(1) << __func__; |
| 606 DCHECK(thread_checker_.CalledOnValidThread()); | 641 DCHECK(thread_checker_.CalledOnValidThread()); |
| 607 video_rotation_ = video_rotation; | 642 video_rotation_ = video_rotation; |
| 608 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); | 643 SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata); |
| 609 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); | 644 SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData); |
| 610 | 645 |
| 611 video_weblayer_.reset(new cc_blink::WebLayerImpl( | 646 video_weblayer_.reset(new cc_blink::WebLayerImpl( |
| 612 cc::VideoLayer::Create(compositor_.get(), video_rotation_))); | 647 cc::VideoLayer::Create(compositor_.get(), video_rotation_))); |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 655 void WebMediaPlayerMS::ResetCanvasCache() { | 690 void WebMediaPlayerMS::ResetCanvasCache() { |
| 656 DCHECK(thread_checker_.CalledOnValidThread()); | 691 DCHECK(thread_checker_.CalledOnValidThread()); |
| 657 video_renderer_.ResetCache(); | 692 video_renderer_.ResetCache(); |
| 658 } | 693 } |
| 659 | 694 |
| 660 void WebMediaPlayerMS::TriggerResize() { | 695 void WebMediaPlayerMS::TriggerResize() { |
| 661 get_client()->sizeChanged(); | 696 get_client()->sizeChanged(); |
| 662 } | 697 } |
| 663 | 698 |
| 664 } // namespace content | 699 } // namespace content |
| OLD | NEW |