OLD | NEW |
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 "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "CCVideoLayerImpl.h" | 7 #include "CCVideoLayerImpl.h" |
8 | 8 |
9 #include "CCIOSurfaceDrawQuad.h" | 9 #include "CCIOSurfaceDrawQuad.h" |
10 #include "CCLayerTreeHostImpl.h" | 10 #include "CCLayerTreeHostImpl.h" |
11 #include "CCProxy.h" | 11 #include "CCProxy.h" |
12 #include "CCQuadSink.h" | 12 #include "CCQuadSink.h" |
13 #include "CCResourceProvider.h" | 13 #include "CCResourceProvider.h" |
14 #include "CCStreamVideoDrawQuad.h" | 14 #include "CCStreamVideoDrawQuad.h" |
15 #include "CCTextureDrawQuad.h" | 15 #include "CCTextureDrawQuad.h" |
16 #include "CCYUVVideoDrawQuad.h" | 16 #include "CCYUVVideoDrawQuad.h" |
17 #include "Extensions3DChromium.h" | 17 #include "Extensions3DChromium.h" |
18 #include "GraphicsContext3D.h" | 18 #include "GraphicsContext3D.h" |
19 #include "NotImplemented.h" | 19 #include "NotImplemented.h" |
20 #include <public/WebVideoFrame.h> | 20 #include <public/WebVideoFrame.h> |
21 | 21 |
22 namespace cc { | 22 namespace cc { |
23 | 23 |
24 CCVideoLayerImpl::CCVideoLayerImpl(int id, WebKit::WebVideoFrameProvider* provid
er) | 24 VideoLayerImpl::VideoLayerImpl(int id, WebKit::WebVideoFrameProvider* provider) |
25 : CCLayerImpl(id) | 25 : LayerImpl(id) |
26 , m_provider(provider) | 26 , m_provider(provider) |
27 , m_frame(0) | 27 , m_frame(0) |
28 , m_externalTextureResource(0) | 28 , m_externalTextureResource(0) |
29 { | 29 { |
30 // This matrix is the default transformation for stream textures, and flips
on the Y axis. | 30 // This matrix is the default transformation for stream textures, and flips
on the Y axis. |
31 m_streamTextureMatrix = WebKit::WebTransformationMatrix( | 31 m_streamTextureMatrix = WebKit::WebTransformationMatrix( |
32 1, 0, 0, 0, | 32 1, 0, 0, 0, |
33 0, -1, 0, 0, | 33 0, -1, 0, 0, |
34 0, 0, 1, 0, | 34 0, 0, 1, 0, |
35 0, 1, 0, 1); | 35 0, 1, 0, 1); |
36 | 36 |
37 // This only happens during a commit on the compositor thread while the main | 37 // This only happens during a commit on the compositor thread while the main |
38 // thread is blocked. That makes this a thread-safe call to set the video | 38 // thread is blocked. That makes this a thread-safe call to set the video |
39 // frame provider client that does not require a lock. The same is true of | 39 // frame provider client that does not require a lock. The same is true of |
40 // the call in the destructor. | 40 // the call in the destructor. |
41 ASSERT(CCProxy::isMainThreadBlocked()); | 41 ASSERT(Proxy::isMainThreadBlocked()); |
42 m_provider->setVideoFrameProviderClient(this); | 42 m_provider->setVideoFrameProviderClient(this); |
43 } | 43 } |
44 | 44 |
45 CCVideoLayerImpl::~CCVideoLayerImpl() | 45 VideoLayerImpl::~VideoLayerImpl() |
46 { | 46 { |
47 // See comment in constructor for why this doesn't need a lock. | 47 // See comment in constructor for why this doesn't need a lock. |
48 ASSERT(CCProxy::isMainThreadBlocked()); | 48 ASSERT(Proxy::isMainThreadBlocked()); |
49 if (m_provider) { | 49 if (m_provider) { |
50 m_provider->setVideoFrameProviderClient(0); | 50 m_provider->setVideoFrameProviderClient(0); |
51 m_provider = 0; | 51 m_provider = 0; |
52 } | 52 } |
53 freePlaneData(layerTreeHostImpl()->resourceProvider()); | 53 freePlaneData(layerTreeHostImpl()->resourceProvider()); |
54 | 54 |
55 #if !ASSERT_DISABLED | 55 #if !ASSERT_DISABLED |
56 for (unsigned i = 0; i < WebKit::WebVideoFrame::maxPlanes; ++i) | 56 for (unsigned i = 0; i < WebKit::WebVideoFrame::maxPlanes; ++i) |
57 ASSERT(!m_framePlanes[i].resourceId); | 57 ASSERT(!m_framePlanes[i].resourceId); |
58 ASSERT(!m_externalTextureResource); | 58 ASSERT(!m_externalTextureResource); |
59 #endif | 59 #endif |
60 } | 60 } |
61 | 61 |
62 void CCVideoLayerImpl::stopUsingProvider() | 62 void VideoLayerImpl::stopUsingProvider() |
63 { | 63 { |
64 // Block the provider from shutting down until this client is done | 64 // Block the provider from shutting down until this client is done |
65 // using the frame. | 65 // using the frame. |
66 base::AutoLock locker(m_providerLock); | 66 base::AutoLock locker(m_providerLock); |
67 ASSERT(!m_frame); | 67 ASSERT(!m_frame); |
68 m_provider = 0; | 68 m_provider = 0; |
69 } | 69 } |
70 | 70 |
71 // Convert WebKit::WebVideoFrame::Format to GraphicsContext3D's format enum valu
es. | 71 // Convert WebKit::WebVideoFrame::Format to GraphicsContext3D's format enum valu
es. |
72 static GC3Denum convertVFCFormatToGC3DFormat(const WebKit::WebVideoFrame& frame) | 72 static GC3Denum convertVFCFormatToGC3DFormat(const WebKit::WebVideoFrame& frame) |
73 { | 73 { |
74 switch (frame.format()) { | 74 switch (frame.format()) { |
75 case WebKit::WebVideoFrame::FormatYV12: | 75 case WebKit::WebVideoFrame::FormatYV12: |
76 case WebKit::WebVideoFrame::FormatYV16: | 76 case WebKit::WebVideoFrame::FormatYV16: |
77 return GraphicsContext3D::LUMINANCE; | 77 return GraphicsContext3D::LUMINANCE; |
78 case WebKit::WebVideoFrame::FormatNativeTexture: | 78 case WebKit::WebVideoFrame::FormatNativeTexture: |
79 return frame.textureTarget(); | 79 return frame.textureTarget(); |
80 case WebKit::WebVideoFrame::FormatInvalid: | 80 case WebKit::WebVideoFrame::FormatInvalid: |
81 case WebKit::WebVideoFrame::FormatRGB32: | 81 case WebKit::WebVideoFrame::FormatRGB32: |
82 case WebKit::WebVideoFrame::FormatEmpty: | 82 case WebKit::WebVideoFrame::FormatEmpty: |
83 case WebKit::WebVideoFrame::FormatI420: | 83 case WebKit::WebVideoFrame::FormatI420: |
84 notImplemented(); | 84 notImplemented(); |
85 } | 85 } |
86 return GraphicsContext3D::INVALID_VALUE; | 86 return GraphicsContext3D::INVALID_VALUE; |
87 } | 87 } |
88 | 88 |
89 void CCVideoLayerImpl::willDraw(CCResourceProvider* resourceProvider) | 89 void VideoLayerImpl::willDraw(ResourceProvider* resourceProvider) |
90 { | 90 { |
91 ASSERT(CCProxy::isImplThread()); | 91 ASSERT(Proxy::isImplThread()); |
92 CCLayerImpl::willDraw(resourceProvider); | 92 LayerImpl::willDraw(resourceProvider); |
93 | 93 |
94 // Explicitly acquire and release the provider mutex so it can be held from | 94 // Explicitly acquire and release the provider mutex so it can be held from |
95 // willDraw to didDraw. Since the compositor thread is in the middle of | 95 // willDraw to didDraw. Since the compositor thread is in the middle of |
96 // drawing, the layer will not be destroyed before didDraw is called. | 96 // drawing, the layer will not be destroyed before didDraw is called. |
97 // Therefore, the only thing that will prevent this lock from being released | 97 // Therefore, the only thing that will prevent this lock from being released |
98 // is the GPU process locking it. As the GPU process can't cause the | 98 // is the GPU process locking it. As the GPU process can't cause the |
99 // destruction of the provider (calling stopUsingProvider), holding this | 99 // destruction of the provider (calling stopUsingProvider), holding this |
100 // lock should not cause a deadlock. | 100 // lock should not cause a deadlock. |
101 m_providerLock.Acquire(); | 101 m_providerLock.Acquire(); |
102 | 102 |
103 willDrawInternal(resourceProvider); | 103 willDrawInternal(resourceProvider); |
104 freeUnusedPlaneData(resourceProvider); | 104 freeUnusedPlaneData(resourceProvider); |
105 | 105 |
106 if (!m_frame) | 106 if (!m_frame) |
107 m_providerLock.Release(); | 107 m_providerLock.Release(); |
108 } | 108 } |
109 | 109 |
110 void CCVideoLayerImpl::willDrawInternal(CCResourceProvider* resourceProvider) | 110 void VideoLayerImpl::willDrawInternal(ResourceProvider* resourceProvider) |
111 { | 111 { |
112 ASSERT(CCProxy::isImplThread()); | 112 ASSERT(Proxy::isImplThread()); |
113 ASSERT(!m_externalTextureResource); | 113 ASSERT(!m_externalTextureResource); |
114 | 114 |
115 if (!m_provider) { | 115 if (!m_provider) { |
116 m_frame = 0; | 116 m_frame = 0; |
117 return; | 117 return; |
118 } | 118 } |
119 | 119 |
120 m_frame = m_provider->getCurrentFrame(); | 120 m_frame = m_provider->getCurrentFrame(); |
121 | 121 |
122 if (!m_frame) | 122 if (!m_frame) |
(...skipping 22 matching lines...) Expand all Loading... |
145 if (!copyPlaneData(resourceProvider)) { | 145 if (!copyPlaneData(resourceProvider)) { |
146 m_provider->putCurrentFrame(m_frame); | 146 m_provider->putCurrentFrame(m_frame); |
147 m_frame = 0; | 147 m_frame = 0; |
148 return; | 148 return; |
149 } | 149 } |
150 | 150 |
151 if (m_format == GraphicsContext3D::TEXTURE_2D) | 151 if (m_format == GraphicsContext3D::TEXTURE_2D) |
152 m_externalTextureResource = resourceProvider->createResourceFromExternal
Texture(m_frame->textureId()); | 152 m_externalTextureResource = resourceProvider->createResourceFromExternal
Texture(m_frame->textureId()); |
153 } | 153 } |
154 | 154 |
155 void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appe
ndQuadsData) | 155 void VideoLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuad
sData) |
156 { | 156 { |
157 ASSERT(CCProxy::isImplThread()); | 157 ASSERT(Proxy::isImplThread()); |
158 | 158 |
159 if (!m_frame) | 159 if (!m_frame) |
160 return; | 160 return; |
161 | 161 |
162 CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createShare
dQuadState()); | 162 SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQ
uadState()); |
163 appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData); | 163 appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData); |
164 | 164 |
165 // FIXME: When we pass quads out of process, we need to double-buffer, or | 165 // FIXME: When we pass quads out of process, we need to double-buffer, or |
166 // otherwise synchonize use of all textures in the quad. | 166 // otherwise synchonize use of all textures in the quad. |
167 | 167 |
168 IntRect quadRect(IntPoint(), contentBounds()); | 168 IntRect quadRect(IntPoint(), contentBounds()); |
169 | 169 |
170 switch (m_format) { | 170 switch (m_format) { |
171 case GraphicsContext3D::LUMINANCE: { | 171 case GraphicsContext3D::LUMINANCE: { |
172 // YUV software decoder. | 172 // YUV software decoder. |
173 const FramePlane& yPlane = m_framePlanes[WebKit::WebVideoFrame::yPlane]; | 173 const FramePlane& yPlane = m_framePlanes[WebKit::WebVideoFrame::yPlane]; |
174 const FramePlane& uPlane = m_framePlanes[WebKit::WebVideoFrame::uPlane]; | 174 const FramePlane& uPlane = m_framePlanes[WebKit::WebVideoFrame::uPlane]; |
175 const FramePlane& vPlane = m_framePlanes[WebKit::WebVideoFrame::vPlane]; | 175 const FramePlane& vPlane = m_framePlanes[WebKit::WebVideoFrame::vPlane]; |
176 scoped_ptr<CCYUVVideoDrawQuad> yuvVideoQuad = CCYUVVideoDrawQuad::create
(sharedQuadState, quadRect, yPlane, uPlane, vPlane); | 176 scoped_ptr<YUVVideoDrawQuad> yuvVideoQuad = YUVVideoDrawQuad::create(sha
redQuadState, quadRect, yPlane, uPlane, vPlane); |
177 quadSink.append(yuvVideoQuad.PassAs<CCDrawQuad>(), appendQuadsData); | 177 quadSink.append(yuvVideoQuad.PassAs<DrawQuad>(), appendQuadsData); |
178 break; | 178 break; |
179 } | 179 } |
180 case GraphicsContext3D::RGBA: { | 180 case GraphicsContext3D::RGBA: { |
181 // RGBA software decoder. | 181 // RGBA software decoder. |
182 const FramePlane& plane = m_framePlanes[WebKit::WebVideoFrame::rgbPlane]
; | 182 const FramePlane& plane = m_framePlanes[WebKit::WebVideoFrame::rgbPlane]
; |
183 float widthScaleFactor = static_cast<float>(plane.visibleSize.width()) /
plane.size.width(); | 183 float widthScaleFactor = static_cast<float>(plane.visibleSize.width()) /
plane.size.width(); |
184 | 184 |
185 bool premultipliedAlpha = true; | 185 bool premultipliedAlpha = true; |
186 FloatRect uvRect(0, 0, widthScaleFactor, 1); | 186 FloatRect uvRect(0, 0, widthScaleFactor, 1); |
187 bool flipped = false; | 187 bool flipped = false; |
188 scoped_ptr<CCTextureDrawQuad> textureQuad = CCTextureDrawQuad::create(sh
aredQuadState, quadRect, plane.resourceId, premultipliedAlpha, uvRect, flipped); | 188 scoped_ptr<TextureDrawQuad> textureQuad = TextureDrawQuad::create(shared
QuadState, quadRect, plane.resourceId, premultipliedAlpha, uvRect, flipped); |
189 quadSink.append(textureQuad.PassAs<CCDrawQuad>(), appendQuadsData); | 189 quadSink.append(textureQuad.PassAs<DrawQuad>(), appendQuadsData); |
190 break; | 190 break; |
191 } | 191 } |
192 case GraphicsContext3D::TEXTURE_2D: { | 192 case GraphicsContext3D::TEXTURE_2D: { |
193 // NativeTexture hardware decoder. | 193 // NativeTexture hardware decoder. |
194 bool premultipliedAlpha = true; | 194 bool premultipliedAlpha = true; |
195 FloatRect uvRect(0, 0, 1, 1); | 195 FloatRect uvRect(0, 0, 1, 1); |
196 bool flipped = false; | 196 bool flipped = false; |
197 scoped_ptr<CCTextureDrawQuad> textureQuad = CCTextureDrawQuad::create(sh
aredQuadState, quadRect, m_externalTextureResource, premultipliedAlpha, uvRect,
flipped); | 197 scoped_ptr<TextureDrawQuad> textureQuad = TextureDrawQuad::create(shared
QuadState, quadRect, m_externalTextureResource, premultipliedAlpha, uvRect, flip
ped); |
198 quadSink.append(textureQuad.PassAs<CCDrawQuad>(), appendQuadsData); | 198 quadSink.append(textureQuad.PassAs<DrawQuad>(), appendQuadsData); |
199 break; | 199 break; |
200 } | 200 } |
201 case Extensions3D::TEXTURE_RECTANGLE_ARB: { | 201 case Extensions3D::TEXTURE_RECTANGLE_ARB: { |
202 IntSize textureSize(m_frame->width(), m_frame->height()); | 202 IntSize textureSize(m_frame->width(), m_frame->height()); |
203 scoped_ptr<CCIOSurfaceDrawQuad> ioSurfaceQuad = CCIOSurfaceDrawQuad::cre
ate(sharedQuadState, quadRect, textureSize, m_frame->textureId(), CCIOSurfaceDra
wQuad::Unflipped); | 203 scoped_ptr<IOSurfaceDrawQuad> ioSurfaceQuad = IOSurfaceDrawQuad::create(
sharedQuadState, quadRect, textureSize, m_frame->textureId(), IOSurfaceDrawQuad:
:Unflipped); |
204 quadSink.append(ioSurfaceQuad.PassAs<CCDrawQuad>(), appendQuadsData); | 204 quadSink.append(ioSurfaceQuad.PassAs<DrawQuad>(), appendQuadsData); |
205 break; | 205 break; |
206 } | 206 } |
207 case Extensions3DChromium::GL_TEXTURE_EXTERNAL_OES: { | 207 case Extensions3DChromium::GL_TEXTURE_EXTERNAL_OES: { |
208 // StreamTexture hardware decoder. | 208 // StreamTexture hardware decoder. |
209 scoped_ptr<CCStreamVideoDrawQuad> streamVideoQuad = CCStreamVideoDrawQua
d::create(sharedQuadState, quadRect, m_frame->textureId(), m_streamTextureMatrix
); | 209 scoped_ptr<StreamVideoDrawQuad> streamVideoQuad = StreamVideoDrawQuad::c
reate(sharedQuadState, quadRect, m_frame->textureId(), m_streamTextureMatrix); |
210 quadSink.append(streamVideoQuad.PassAs<CCDrawQuad>(), appendQuadsData); | 210 quadSink.append(streamVideoQuad.PassAs<DrawQuad>(), appendQuadsData); |
211 break; | 211 break; |
212 } | 212 } |
213 default: | 213 default: |
214 CRASH(); // Someone updated convertVFCFormatToGC3DFormat above but updat
e this! | 214 CRASH(); // Someone updated convertVFCFormatToGC3DFormat above but updat
e this! |
215 } | 215 } |
216 } | 216 } |
217 | 217 |
218 void CCVideoLayerImpl::didDraw(CCResourceProvider* resourceProvider) | 218 void VideoLayerImpl::didDraw(ResourceProvider* resourceProvider) |
219 { | 219 { |
220 ASSERT(CCProxy::isImplThread()); | 220 ASSERT(Proxy::isImplThread()); |
221 CCLayerImpl::didDraw(resourceProvider); | 221 LayerImpl::didDraw(resourceProvider); |
222 | 222 |
223 if (!m_frame) | 223 if (!m_frame) |
224 return; | 224 return; |
225 | 225 |
226 if (m_format == GraphicsContext3D::TEXTURE_2D) { | 226 if (m_format == GraphicsContext3D::TEXTURE_2D) { |
227 ASSERT(m_externalTextureResource); | 227 ASSERT(m_externalTextureResource); |
228 // FIXME: the following assert will not be true when sending resources t
o a | 228 // FIXME: the following assert will not be true when sending resources t
o a |
229 // parent compositor. We will probably need to hold on to m_frame for | 229 // parent compositor. We will probably need to hold on to m_frame for |
230 // longer, and have several "current frames" in the pipeline. | 230 // longer, and have several "current frames" in the pipeline. |
231 ASSERT(!resourceProvider->inUseByConsumer(m_externalTextureResource)); | 231 ASSERT(!resourceProvider->inUseByConsumer(m_externalTextureResource)); |
(...skipping 12 matching lines...) Expand all Loading... |
244 if (format == WebKit::WebVideoFrame::FormatYV12 && plane != WebKit::WebVideo
Frame::yPlane) | 244 if (format == WebKit::WebVideoFrame::FormatYV12 && plane != WebKit::WebVideo
Frame::yPlane) |
245 return originalDimension / 2; | 245 return originalDimension / 2; |
246 return originalDimension; | 246 return originalDimension; |
247 } | 247 } |
248 | 248 |
249 static bool hasPaddingBytes(const WebKit::WebVideoFrame& frame, unsigned plane) | 249 static bool hasPaddingBytes(const WebKit::WebVideoFrame& frame, unsigned plane) |
250 { | 250 { |
251 return frame.stride(plane) > videoFrameDimension(frame.width(), plane, frame
.format()); | 251 return frame.stride(plane) > videoFrameDimension(frame.width(), plane, frame
.format()); |
252 } | 252 } |
253 | 253 |
254 IntSize CCVideoLayerImpl::computeVisibleSize(const WebKit::WebVideoFrame& frame,
unsigned plane) | 254 IntSize VideoLayerImpl::computeVisibleSize(const WebKit::WebVideoFrame& frame, u
nsigned plane) |
255 { | 255 { |
256 int visibleWidth = videoFrameDimension(frame.width(), plane, frame.format())
; | 256 int visibleWidth = videoFrameDimension(frame.width(), plane, frame.format())
; |
257 int originalWidth = visibleWidth; | 257 int originalWidth = visibleWidth; |
258 int visibleHeight = videoFrameDimension(frame.height(), plane, frame.format(
)); | 258 int visibleHeight = videoFrameDimension(frame.height(), plane, frame.format(
)); |
259 | 259 |
260 // When there are dead pixels at the edge of the texture, decrease | 260 // When there are dead pixels at the edge of the texture, decrease |
261 // the frame width by 1 to prevent the rightmost pixels from | 261 // the frame width by 1 to prevent the rightmost pixels from |
262 // interpolating with the dead pixels. | 262 // interpolating with the dead pixels. |
263 if (hasPaddingBytes(frame, plane)) | 263 if (hasPaddingBytes(frame, plane)) |
264 --visibleWidth; | 264 --visibleWidth; |
265 | 265 |
266 // In YV12, every 2x2 square of Y values corresponds to one U and | 266 // In YV12, every 2x2 square of Y values corresponds to one U and |
267 // one V value. If we decrease the width of the UV plane, we must decrease t
he | 267 // one V value. If we decrease the width of the UV plane, we must decrease t
he |
268 // width of the Y texture by 2 for proper alignment. This must happen | 268 // width of the Y texture by 2 for proper alignment. This must happen |
269 // always, even if Y's texture does not have padding bytes. | 269 // always, even if Y's texture does not have padding bytes. |
270 if (plane == WebKit::WebVideoFrame::yPlane && frame.format() == WebKit::WebV
ideoFrame::FormatYV12) { | 270 if (plane == WebKit::WebVideoFrame::yPlane && frame.format() == WebKit::WebV
ideoFrame::FormatYV12) { |
271 if (hasPaddingBytes(frame, WebKit::WebVideoFrame::uPlane)) | 271 if (hasPaddingBytes(frame, WebKit::WebVideoFrame::uPlane)) |
272 visibleWidth = originalWidth - 2; | 272 visibleWidth = originalWidth - 2; |
273 } | 273 } |
274 | 274 |
275 return IntSize(visibleWidth, visibleHeight); | 275 return IntSize(visibleWidth, visibleHeight); |
276 } | 276 } |
277 | 277 |
278 bool CCVideoLayerImpl::FramePlane::allocateData(CCResourceProvider* resourceProv
ider) | 278 bool VideoLayerImpl::FramePlane::allocateData(ResourceProvider* resourceProvider
) |
279 { | 279 { |
280 if (resourceId) | 280 if (resourceId) |
281 return true; | 281 return true; |
282 | 282 |
283 resourceId = resourceProvider->createResource(CCRenderer::ImplPool, size, fo
rmat, CCResourceProvider::TextureUsageAny); | 283 resourceId = resourceProvider->createResource(Renderer::ImplPool, size, form
at, ResourceProvider::TextureUsageAny); |
284 return resourceId; | 284 return resourceId; |
285 } | 285 } |
286 | 286 |
287 void CCVideoLayerImpl::FramePlane::freeData(CCResourceProvider* resourceProvider
) | 287 void VideoLayerImpl::FramePlane::freeData(ResourceProvider* resourceProvider) |
288 { | 288 { |
289 if (!resourceId) | 289 if (!resourceId) |
290 return; | 290 return; |
291 | 291 |
292 resourceProvider->deleteResource(resourceId); | 292 resourceProvider->deleteResource(resourceId); |
293 resourceId = 0; | 293 resourceId = 0; |
294 } | 294 } |
295 | 295 |
296 bool CCVideoLayerImpl::allocatePlaneData(CCResourceProvider* resourceProvider) | 296 bool VideoLayerImpl::allocatePlaneData(ResourceProvider* resourceProvider) |
297 { | 297 { |
298 int maxTextureSize = resourceProvider->maxTextureSize(); | 298 int maxTextureSize = resourceProvider->maxTextureSize(); |
299 for (unsigned planeIndex = 0; planeIndex < m_frame->planes(); ++planeIndex)
{ | 299 for (unsigned planeIndex = 0; planeIndex < m_frame->planes(); ++planeIndex)
{ |
300 CCVideoLayerImpl::FramePlane& plane = m_framePlanes[planeIndex]; | 300 VideoLayerImpl::FramePlane& plane = m_framePlanes[planeIndex]; |
301 | 301 |
302 IntSize requiredTextureSize(m_frame->stride(planeIndex), videoFrameDimen
sion(m_frame->height(), planeIndex, m_frame->format())); | 302 IntSize requiredTextureSize(m_frame->stride(planeIndex), videoFrameDimen
sion(m_frame->height(), planeIndex, m_frame->format())); |
303 // FIXME: Remove the test against maxTextureSize when tiled layers are i
mplemented. | 303 // FIXME: Remove the test against maxTextureSize when tiled layers are i
mplemented. |
304 if (requiredTextureSize.isZero() || requiredTextureSize.width() > maxTex
tureSize || requiredTextureSize.height() > maxTextureSize) | 304 if (requiredTextureSize.isZero() || requiredTextureSize.width() > maxTex
tureSize || requiredTextureSize.height() > maxTextureSize) |
305 return false; | 305 return false; |
306 | 306 |
307 if (plane.size != requiredTextureSize || plane.format != m_format) { | 307 if (plane.size != requiredTextureSize || plane.format != m_format) { |
308 plane.freeData(resourceProvider); | 308 plane.freeData(resourceProvider); |
309 plane.size = requiredTextureSize; | 309 plane.size = requiredTextureSize; |
310 plane.format = m_format; | 310 plane.format = m_format; |
311 } | 311 } |
312 | 312 |
313 if (!plane.resourceId) { | 313 if (!plane.resourceId) { |
314 if (!plane.allocateData(resourceProvider)) | 314 if (!plane.allocateData(resourceProvider)) |
315 return false; | 315 return false; |
316 plane.visibleSize = computeVisibleSize(*m_frame, planeIndex); | 316 plane.visibleSize = computeVisibleSize(*m_frame, planeIndex); |
317 } | 317 } |
318 } | 318 } |
319 return true; | 319 return true; |
320 } | 320 } |
321 | 321 |
322 bool CCVideoLayerImpl::copyPlaneData(CCResourceProvider* resourceProvider) | 322 bool VideoLayerImpl::copyPlaneData(ResourceProvider* resourceProvider) |
323 { | 323 { |
324 size_t softwarePlaneCount = m_frame->planes(); | 324 size_t softwarePlaneCount = m_frame->planes(); |
325 if (!softwarePlaneCount) | 325 if (!softwarePlaneCount) |
326 return true; | 326 return true; |
327 | 327 |
328 for (size_t softwarePlaneIndex = 0; softwarePlaneIndex < softwarePlaneCount;
++softwarePlaneIndex) { | 328 for (size_t softwarePlaneIndex = 0; softwarePlaneIndex < softwarePlaneCount;
++softwarePlaneIndex) { |
329 CCVideoLayerImpl::FramePlane& plane = m_framePlanes[softwarePlaneIndex]; | 329 VideoLayerImpl::FramePlane& plane = m_framePlanes[softwarePlaneIndex]; |
330 const uint8_t* softwarePlanePixels = static_cast<const uint8_t*>(m_frame
->data(softwarePlaneIndex)); | 330 const uint8_t* softwarePlanePixels = static_cast<const uint8_t*>(m_frame
->data(softwarePlaneIndex)); |
331 IntRect planeRect(IntPoint(), plane.size); | 331 IntRect planeRect(IntPoint(), plane.size); |
332 resourceProvider->upload(plane.resourceId, softwarePlanePixels, planeRec
t, planeRect, IntSize()); | 332 resourceProvider->upload(plane.resourceId, softwarePlanePixels, planeRec
t, planeRect, IntSize()); |
333 } | 333 } |
334 return true; | 334 return true; |
335 } | 335 } |
336 | 336 |
337 void CCVideoLayerImpl::freePlaneData(CCResourceProvider* resourceProvider) | 337 void VideoLayerImpl::freePlaneData(ResourceProvider* resourceProvider) |
338 { | 338 { |
339 for (unsigned i = 0; i < WebKit::WebVideoFrame::maxPlanes; ++i) | 339 for (unsigned i = 0; i < WebKit::WebVideoFrame::maxPlanes; ++i) |
340 m_framePlanes[i].freeData(resourceProvider); | 340 m_framePlanes[i].freeData(resourceProvider); |
341 } | 341 } |
342 | 342 |
343 void CCVideoLayerImpl::freeUnusedPlaneData(CCResourceProvider* resourceProvider) | 343 void VideoLayerImpl::freeUnusedPlaneData(ResourceProvider* resourceProvider) |
344 { | 344 { |
345 unsigned firstUnusedPlane = m_frame ? m_frame->planes() : 0; | 345 unsigned firstUnusedPlane = m_frame ? m_frame->planes() : 0; |
346 for (unsigned i = firstUnusedPlane; i < WebKit::WebVideoFrame::maxPlanes; ++
i) | 346 for (unsigned i = firstUnusedPlane; i < WebKit::WebVideoFrame::maxPlanes; ++
i) |
347 m_framePlanes[i].freeData(resourceProvider); | 347 m_framePlanes[i].freeData(resourceProvider); |
348 } | 348 } |
349 | 349 |
350 void CCVideoLayerImpl::didReceiveFrame() | 350 void VideoLayerImpl::didReceiveFrame() |
351 { | 351 { |
352 setNeedsRedraw(); | 352 setNeedsRedraw(); |
353 } | 353 } |
354 | 354 |
355 void CCVideoLayerImpl::didUpdateMatrix(const float matrix[16]) | 355 void VideoLayerImpl::didUpdateMatrix(const float matrix[16]) |
356 { | 356 { |
357 m_streamTextureMatrix = WebKit::WebTransformationMatrix( | 357 m_streamTextureMatrix = WebKit::WebTransformationMatrix( |
358 matrix[0], matrix[1], matrix[2], matrix[3], | 358 matrix[0], matrix[1], matrix[2], matrix[3], |
359 matrix[4], matrix[5], matrix[6], matrix[7], | 359 matrix[4], matrix[5], matrix[6], matrix[7], |
360 matrix[8], matrix[9], matrix[10], matrix[11], | 360 matrix[8], matrix[9], matrix[10], matrix[11], |
361 matrix[12], matrix[13], matrix[14], matrix[15]); | 361 matrix[12], matrix[13], matrix[14], matrix[15]); |
362 setNeedsRedraw(); | 362 setNeedsRedraw(); |
363 } | 363 } |
364 | 364 |
365 void CCVideoLayerImpl::didLoseContext() | 365 void VideoLayerImpl::didLoseContext() |
366 { | 366 { |
367 freePlaneData(layerTreeHostImpl()->resourceProvider()); | 367 freePlaneData(layerTreeHostImpl()->resourceProvider()); |
368 } | 368 } |
369 | 369 |
370 void CCVideoLayerImpl::setNeedsRedraw() | 370 void VideoLayerImpl::setNeedsRedraw() |
371 { | 371 { |
372 layerTreeHostImpl()->setNeedsRedraw(); | 372 layerTreeHostImpl()->setNeedsRedraw(); |
373 } | 373 } |
374 | 374 |
375 void CCVideoLayerImpl::dumpLayerProperties(std::string* str, int indent) const | 375 void VideoLayerImpl::dumpLayerProperties(std::string* str, int indent) const |
376 { | 376 { |
377 str->append(indentString(indent)); | 377 str->append(indentString(indent)); |
378 str->append("video layer\n"); | 378 str->append("video layer\n"); |
379 CCLayerImpl::dumpLayerProperties(str, indent); | 379 LayerImpl::dumpLayerProperties(str, indent); |
380 } | 380 } |
381 | 381 |
382 const char* CCVideoLayerImpl::layerTypeAsString() const | 382 const char* VideoLayerImpl::layerTypeAsString() const |
383 { | 383 { |
384 return "VideoLayer"; | 384 return "VideoLayer"; |
385 } | 385 } |
386 | 386 |
387 } | 387 } |
OLD | NEW |