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

Side by Side Diff: cc/video_layer_impl.cc

Issue 11411050: cc: Make the DrawQuad subclasses into struct-like classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « cc/tiled_layer_impl_unittest.cc ('k') | cc/yuv_video_draw_quad.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/video_layer_impl.h" 5 #include "cc/video_layer_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "cc/io_surface_draw_quad.h" 8 #include "cc/io_surface_draw_quad.h"
9 #include "cc/layer_tree_host_impl.h" 9 #include "cc/layer_tree_host_impl.h"
10 #include "cc/quad_sink.h" 10 #include "cc/quad_sink.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 const float texHeightScale = 210 const float texHeightScale =
211 static_cast<float>(visibleRect.height()) / codedSize.height(); 211 static_cast<float>(visibleRect.height()) / codedSize.height();
212 212
213 switch (m_format) { 213 switch (m_format) {
214 case GL_LUMINANCE: { 214 case GL_LUMINANCE: {
215 // YUV software decoder. 215 // YUV software decoder.
216 const FramePlane& yPlane = m_framePlanes[media::VideoFrame::kYPlane]; 216 const FramePlane& yPlane = m_framePlanes[media::VideoFrame::kYPlane];
217 const FramePlane& uPlane = m_framePlanes[media::VideoFrame::kUPlane]; 217 const FramePlane& uPlane = m_framePlanes[media::VideoFrame::kUPlane];
218 const FramePlane& vPlane = m_framePlanes[media::VideoFrame::kVPlane]; 218 const FramePlane& vPlane = m_framePlanes[media::VideoFrame::kVPlane];
219 gfx::SizeF texScale(texWidthScale, texHeightScale); 219 gfx::SizeF texScale(texWidthScale, texHeightScale);
220 scoped_ptr<YUVVideoDrawQuad> yuvVideoQuad = YUVVideoDrawQuad::create( 220 scoped_ptr<YUVVideoDrawQuad> yuvVideoQuad = YUVVideoDrawQuad::Create();
221 sharedQuadState, quadRect, opaqueRect, texScale, yPlane, uPlane, vPl ane); 221 yuvVideoQuad->SetNew(sharedQuadState, quadRect, opaqueRect, texScale, yP lane, uPlane, vPlane);
222 quadSink.append(yuvVideoQuad.PassAs<DrawQuad>(), appendQuadsData); 222 quadSink.append(yuvVideoQuad.PassAs<DrawQuad>(), appendQuadsData);
223 break; 223 break;
224 } 224 }
225 case GL_RGBA: { 225 case GL_RGBA: {
226 // RGBA software decoder. 226 // RGBA software decoder.
227 const FramePlane& plane = m_framePlanes[media::VideoFrame::kRGBPlane]; 227 const FramePlane& plane = m_framePlanes[media::VideoFrame::kRGBPlane];
228 bool premultipliedAlpha = true; 228 bool premultipliedAlpha = true;
229 gfx::RectF uvRect(0, 0, texWidthScale, texHeightScale); 229 gfx::RectF uvRect(0, 0, texWidthScale, texHeightScale);
230 bool flipped = false; 230 bool flipped = false;
231 scoped_ptr<TextureDrawQuad> textureQuad = TextureDrawQuad::create(shared QuadState, quadRect, opaqueRect, plane.resourceId, premultipliedAlpha, uvRect, f lipped); 231 scoped_ptr<TextureDrawQuad> textureQuad = TextureDrawQuad::Create();
232 textureQuad->SetNew(sharedQuadState, quadRect, opaqueRect, plane.resourc eId, premultipliedAlpha, uvRect, flipped);
232 quadSink.append(textureQuad.PassAs<DrawQuad>(), appendQuadsData); 233 quadSink.append(textureQuad.PassAs<DrawQuad>(), appendQuadsData);
233 break; 234 break;
234 } 235 }
235 case GL_TEXTURE_2D: { 236 case GL_TEXTURE_2D: {
236 // NativeTexture hardware decoder. 237 // NativeTexture hardware decoder.
237 bool premultipliedAlpha = true; 238 bool premultipliedAlpha = true;
238 gfx::RectF uvRect(0, 0, texWidthScale, texHeightScale); 239 gfx::RectF uvRect(0, 0, texWidthScale, texHeightScale);
239 bool flipped = false; 240 bool flipped = false;
240 scoped_ptr<TextureDrawQuad> textureQuad = TextureDrawQuad::create(shared QuadState, quadRect, opaqueRect, m_externalTextureResource, premultipliedAlpha, uvRect, flipped); 241 scoped_ptr<TextureDrawQuad> textureQuad = TextureDrawQuad::Create();
242 textureQuad->SetNew(sharedQuadState, quadRect, opaqueRect, m_externalTex tureResource, premultipliedAlpha, uvRect, flipped);
241 quadSink.append(textureQuad.PassAs<DrawQuad>(), appendQuadsData); 243 quadSink.append(textureQuad.PassAs<DrawQuad>(), appendQuadsData);
242 break; 244 break;
243 } 245 }
244 case GL_TEXTURE_RECTANGLE_ARB: { 246 case GL_TEXTURE_RECTANGLE_ARB: {
245 gfx::Size visibleSize(visibleRect.width(), visibleRect.height()); 247 gfx::Size visibleSize(visibleRect.width(), visibleRect.height());
246 scoped_ptr<IOSurfaceDrawQuad> ioSurfaceQuad = IOSurfaceDrawQuad::create( sharedQuadState, quadRect, opaqueRect, visibleSize, m_frame->texture_id(), IOSur faceDrawQuad::Unflipped); 248 scoped_ptr<IOSurfaceDrawQuad> ioSurfaceQuad = IOSurfaceDrawQuad::Create( );
249 ioSurfaceQuad->SetNew(sharedQuadState, quadRect, opaqueRect, visibleSize , m_frame->texture_id(), IOSurfaceDrawQuad::UNFLIPPED);
247 quadSink.append(ioSurfaceQuad.PassAs<DrawQuad>(), appendQuadsData); 250 quadSink.append(ioSurfaceQuad.PassAs<DrawQuad>(), appendQuadsData);
248 break; 251 break;
249 } 252 }
250 case GL_TEXTURE_EXTERNAL_OES: { 253 case GL_TEXTURE_EXTERNAL_OES: {
251 // StreamTexture hardware decoder. 254 // StreamTexture hardware decoder.
252 WebKit::WebTransformationMatrix transform(m_streamTextureMatrix); 255 WebKit::WebTransformationMatrix transform(m_streamTextureMatrix);
253 transform.scaleNonUniform(texWidthScale, texHeightScale); 256 transform.scaleNonUniform(texWidthScale, texHeightScale);
254 scoped_ptr<StreamVideoDrawQuad> streamVideoQuad = 257 scoped_ptr<StreamVideoDrawQuad> streamVideoQuad = StreamVideoDrawQuad::C reate();
255 StreamVideoDrawQuad::create(sharedQuadState, quadRect, opaqueRect, 258 streamVideoQuad->SetNew(sharedQuadState, quadRect, opaqueRect, m_frame-> texture_id(), transform);
256 m_frame->texture_id(),
257 transform);
258 quadSink.append(streamVideoQuad.PassAs<DrawQuad>(), appendQuadsData); 259 quadSink.append(streamVideoQuad.PassAs<DrawQuad>(), appendQuadsData);
259 break; 260 break;
260 } 261 }
261 default: 262 default:
262 NOTREACHED(); // Someone updated convertVFCFormatToGLenum above but upd ate this! 263 NOTREACHED(); // Someone updated convertVFCFormatToGLenum above but upd ate this!
263 break; 264 break;
264 } 265 }
265 } 266 }
266 267
267 void VideoLayerImpl::didDraw(ResourceProvider* resourceProvider) 268 void VideoLayerImpl::didDraw(ResourceProvider* resourceProvider)
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 { 417 {
417 layerTreeHostImpl()->setNeedsRedraw(); 418 layerTreeHostImpl()->setNeedsRedraw();
418 } 419 }
419 420
420 const char* VideoLayerImpl::layerTypeAsString() const 421 const char* VideoLayerImpl::layerTypeAsString() const
421 { 422 {
422 return "VideoLayer"; 423 return "VideoLayer";
423 } 424 }
424 425
425 } // namespace cc 426 } // namespace cc
OLDNEW
« no previous file with comments | « cc/tiled_layer_impl_unittest.cc ('k') | cc/yuv_video_draw_quad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698