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

Side by Side Diff: media/renderers/skcanvas_video_renderer.cc

Issue 2825333003: Remove kRenderTarget flag when wrapping a texture as an SkImage in skcanvas_video_renderer (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "media/renderers/skcanvas_video_renderer.h" 5 #include "media/renderers/skcanvas_video_renderer.h"
6 6
7 #include <GLES3/gl3.h> 7 #include <GLES3/gl3.h>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 SkCanvasVideoRenderer::CopyVideoFrameSingleTextureToGLTexture( 202 SkCanvasVideoRenderer::CopyVideoFrameSingleTextureToGLTexture(
203 gl, video_frame, 203 gl, video_frame,
204 SkCanvasVideoRenderer::SingleFrameForVideoElementOrCanvas, 204 SkCanvasVideoRenderer::SingleFrameForVideoElementOrCanvas,
205 source_texture, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, true, false); 205 source_texture, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, true, false);
206 } else { 206 } else {
207 gl->WaitSyncTokenCHROMIUM(mailbox_holder.sync_token.GetConstData()); 207 gl->WaitSyncTokenCHROMIUM(mailbox_holder.sync_token.GetConstData());
208 source_texture = gl->CreateAndConsumeTextureCHROMIUM( 208 source_texture = gl->CreateAndConsumeTextureCHROMIUM(
209 mailbox_holder.texture_target, mailbox_holder.mailbox.name); 209 mailbox_holder.texture_target, mailbox_holder.mailbox.name);
210 } 210 }
211 GrBackendTextureDesc desc; 211 GrBackendTextureDesc desc;
212 desc.fFlags = kRenderTarget_GrBackendTextureFlag; 212 desc.fFlags = kNone_GrBackendTextureFlag;
213 desc.fOrigin = kTopLeft_GrSurfaceOrigin; 213 desc.fOrigin = kTopLeft_GrSurfaceOrigin;
214 desc.fWidth = video_frame->coded_size().width(); 214 desc.fWidth = video_frame->coded_size().width();
215 desc.fHeight = video_frame->coded_size().height(); 215 desc.fHeight = video_frame->coded_size().height();
216 desc.fConfig = kRGBA_8888_GrPixelConfig; 216 desc.fConfig = kRGBA_8888_GrPixelConfig;
217 GrGLTextureInfo source_texture_info; 217 GrGLTextureInfo source_texture_info;
218 source_texture_info.fID = source_texture; 218 source_texture_info.fID = source_texture;
219 source_texture_info.fTarget = GL_TEXTURE_2D; 219 source_texture_info.fTarget = GL_TEXTURE_2D;
220 desc.fTextureHandle = 220 desc.fTextureHandle =
221 skia::GrGLTextureInfoToGrBackendObject(source_texture_info); 221 skia::GrGLTextureInfoToGrBackendObject(source_texture_info);
222 return SkImage::MakeFromAdoptedTexture(context_3d.gr_context, desc); 222 return SkImage::MakeFromAdoptedTexture(context_3d.gr_context, desc);
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
1022 last_image_->bounds().contains(visible_rect)) { 1022 last_image_->bounds().contains(visible_rect)) {
1023 last_image_ = last_image_->makeSubset(visible_rect); 1023 last_image_ = last_image_->makeSubset(visible_rect);
1024 } 1024 }
1025 } 1025 }
1026 1026
1027 SkISize SkCanvasVideoRenderer::LastImageDimensionsForTesting() { 1027 SkISize SkCanvasVideoRenderer::LastImageDimensionsForTesting() {
1028 return last_image_dimensions_for_testing_; 1028 return last_image_dimensions_for_testing_;
1029 } 1029 }
1030 1030
1031 } // namespace media 1031 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698