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

Unified Diff: media/renderers/skcanvas_video_renderer_unittest.cc

Issue 2767063002: 16-bit video upload to float: intermediate R16_EXT and copy to float. (Closed)
Patch Set: Rebase. Comments fix. Thanks kbr@. 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 side-by-side diff with in-line comments
Download patch
Index: media/renderers/skcanvas_video_renderer_unittest.cc
diff --git a/media/renderers/skcanvas_video_renderer_unittest.cc b/media/renderers/skcanvas_video_renderer_unittest.cc
index a72c0be7ad9ec0e60fc3780158bc986949ff363d..07b79a2a910bcb6c0b86475556af881b8a71f29f 100644
--- a/media/renderers/skcanvas_video_renderer_unittest.cc
+++ b/media/renderers/skcanvas_video_renderer_unittest.cc
@@ -12,6 +12,7 @@
#include "cc/paint/skia_paint_canvas.h"
#include "gpu/GLES2/gl2extchromium.h"
#include "gpu/command_buffer/client/gles2_interface_stub.h"
+#include "gpu/command_buffer/common/capabilities.h"
#include "media/base/timestamp_constants.h"
#include "media/base/video_frame.h"
#include "media/base/video_util.h"
@@ -709,14 +710,7 @@ TEST_F(SkCanvasVideoRendererTest, TexImage2D_Y16_RGBA32F) {
CreateTestY16Frame(gfx::Size(stride, offset_y + height), rect,
memory.get(), cropped_frame()->timestamp());
- // Create GL context.
- sk_sp<const GrGLInterface> null_interface(GrGLCreateNullInterface());
- sk_sp<GrContext> gr_context(GrContext::Create(
- kOpenGL_GrBackend,
- reinterpret_cast<GrBackendContext>(null_interface.get())));
TestGLES2Interface gles2;
- Context3D context_3d(&gles2, gr_context.get());
-
// Bind the texImage2D callback to verify the uint16 to float32 conversion.
gles2.teximage2d_callback_ =
base::Bind([](GLenum target, GLint level, GLint internalformat,
@@ -742,9 +736,9 @@ TEST_F(SkCanvasVideoRendererTest, TexImage2D_Y16_RGBA32F) {
}
}
});
- SkCanvasVideoRenderer::TexImage2D(GL_TEXTURE_2D, &gles2, video_frame.get(), 0,
- GL_RGBA, GL_RGBA, GL_FLOAT, true /*flip_y*/,
- true);
+ SkCanvasVideoRenderer::TexImage2D(
+ GL_TEXTURE_2D, 0, &gles2, gpu::Capabilities(), video_frame.get(), 0,
+ GL_RGBA, GL_RGBA, GL_FLOAT, true /*flip_y*/, true);
}
TEST_F(SkCanvasVideoRendererTest, TexSubImage2D_Y16_R32F) {
@@ -764,14 +758,7 @@ TEST_F(SkCanvasVideoRendererTest, TexSubImage2D_Y16_R32F) {
CreateTestY16Frame(gfx::Size(stride, offset_y + height), rect,
memory.get(), cropped_frame()->timestamp());
- // Create GL context.
- sk_sp<const GrGLInterface> null_interface(GrGLCreateNullInterface());
- sk_sp<GrContext> gr_context(GrContext::Create(
- kOpenGL_GrBackend,
- reinterpret_cast<GrBackendContext>(null_interface.get())));
TestGLES2Interface gles2;
- Context3D context_3d(&gles2, gr_context.get());
-
// Bind the texImage2D callback to verify the uint16 to float32 conversion.
gles2.texsubimage2d_callback_ = base::Bind([](
GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,

Powered by Google App Engine
This is Rietveld 408576698