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

Side by Side Diff: cc/layers/video_layer_impl.cc

Issue 1848923003: Revert of Make Android StreamTexture implement GLStreamTextureImage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "cc/layers/video_layer_impl.h" 5 #include "cc/layers/video_layer_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 break; 312 break;
313 } 313 }
314 case VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE: { 314 case VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE: {
315 DCHECK_EQ(frame_resources_.size(), 1u); 315 DCHECK_EQ(frame_resources_.size(), 1u);
316 if (frame_resources_.size() < 1u) 316 if (frame_resources_.size() < 1u)
317 break; 317 break;
318 gfx::Transform scale; 318 gfx::Transform scale;
319 scale.Scale(tex_width_scale, tex_height_scale); 319 scale.Scale(tex_width_scale, tex_height_scale);
320 StreamVideoDrawQuad* stream_video_quad = 320 StreamVideoDrawQuad* stream_video_quad =
321 render_pass->CreateAndAppendDrawQuad<StreamVideoDrawQuad>(); 321 render_pass->CreateAndAppendDrawQuad<StreamVideoDrawQuad>();
322 stream_video_quad->SetNew(shared_quad_state, quad_rect, opaque_rect, 322 stream_video_quad->SetNew(
323 visible_quad_rect, frame_resources_[0].id, 323 shared_quad_state, quad_rect, opaque_rect, visible_quad_rect,
324 frame_resources_[0].size_in_pixels, scale); 324 frame_resources_[0].id, frame_resources_[0].size_in_pixels,
325 scale * provider_client_impl_->StreamTextureMatrix());
325 ValidateQuadResources(stream_video_quad); 326 ValidateQuadResources(stream_video_quad);
326 break; 327 break;
327 } 328 }
328 case VideoFrameExternalResources::IO_SURFACE: { 329 case VideoFrameExternalResources::IO_SURFACE: {
329 DCHECK_EQ(frame_resources_.size(), 1u); 330 DCHECK_EQ(frame_resources_.size(), 1u);
330 if (frame_resources_.size() < 1u) 331 if (frame_resources_.size() < 1u)
331 break; 332 break;
332 IOSurfaceDrawQuad* io_surface_quad = 333 IOSurfaceDrawQuad* io_surface_quad =
333 render_pass->CreateAndAppendDrawQuad<IOSurfaceDrawQuad>(); 334 render_pass->CreateAndAppendDrawQuad<IOSurfaceDrawQuad>();
334 io_surface_quad->SetNew(shared_quad_state, quad_rect, opaque_rect, 335 io_surface_quad->SetNew(shared_quad_state, quad_rect, opaque_rect,
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 void VideoLayerImpl::SetNeedsRedraw() { 412 void VideoLayerImpl::SetNeedsRedraw() {
412 SetUpdateRect(gfx::UnionRects(update_rect(), gfx::Rect(bounds()))); 413 SetUpdateRect(gfx::UnionRects(update_rect(), gfx::Rect(bounds())));
413 layer_tree_impl()->SetNeedsRedraw(); 414 layer_tree_impl()->SetNeedsRedraw();
414 } 415 }
415 416
416 const char* VideoLayerImpl::LayerTypeAsString() const { 417 const char* VideoLayerImpl::LayerTypeAsString() const {
417 return "cc::VideoLayerImpl"; 418 return "cc::VideoLayerImpl";
418 } 419 }
419 420
420 } // namespace cc 421 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/video_frame_provider_client_impl_unittest.cc ('k') | content/common/gpu/stream_texture_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698