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

Unified Diff: components/viz/common/resources/resource_format_utils.cc

Issue 2969223002: [media]: Replace LUMINANCE_F16 by R16 for 9/10-bit h264 videos.
Patch Set: Fix in resource_format_utils Created 3 years, 4 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
« no previous file with comments | « components/viz/common/resources/resource_format.h ('k') | media/base/media_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/viz/common/resources/resource_format_utils.cc
diff --git a/components/viz/common/resources/resource_format_utils.cc b/components/viz/common/resources/resource_format_utils.cc
index 15c48578bb9edf92d23893430cd3c4047af4ee0c..5746f9e21270f7726518b0fa9024d6eee839eaf7 100644
--- a/components/viz/common/resources/resource_format_utils.cc
+++ b/components/viz/common/resources/resource_format_utils.cc
@@ -27,6 +27,7 @@ SkColorType ResourceFormatToClosestSkColorType(ResourceFormat format) {
case ETC1:
case RED_8:
case LUMINANCE_F16:
+ case R16_EXT:
return kN32_SkColorType;
case RGBA_F16:
return kRGBA_F16_SkColorType;
@@ -45,6 +46,7 @@ int BitsPerPixel(ResourceFormat format) {
case RGBA_4444:
case RGB_565:
case LUMINANCE_F16:
+ case R16_EXT:
return 16;
case ALPHA_8:
case LUMINANCE_8:
@@ -70,6 +72,7 @@ GLenum GLDataType(ResourceFormat format) {
GL_UNSIGNED_BYTE, // RED_8
GL_HALF_FLOAT_OES, // LUMINANCE_F16
GL_HALF_FLOAT_OES, // RGBA_F16
+ GL_UNSIGNED_SHORT, // R16_EXT
};
static_assert(arraysize(format_gl_data_type) == (RESOURCE_FORMAT_MAX + 1),
"format_gl_data_type does not handle all cases.");
@@ -90,6 +93,7 @@ GLenum GLDataFormat(ResourceFormat format) {
GL_RED_EXT, // RED_8
GL_LUMINANCE, // LUMINANCE_F16
GL_RGBA, // RGBA_F16
+ GL_R16_EXT, // R16_EXT
};
static_assert(arraysize(format_gl_data_format) == (RESOURCE_FORMAT_MAX + 1),
"format_gl_data_format does not handle all cases.");
@@ -121,6 +125,7 @@ GLenum GLCopyTextureInternalFormat(ResourceFormat format) {
GL_LUMINANCE, // RED_8
GL_LUMINANCE, // LUMINANCE_F16
GL_RGBA, // RGBA_F16
+ GL_LUMINANCE, // R16_EXT
};
static_assert(arraysize(format_gl_data_format) == (RESOURCE_FORMAT_MAX + 1),
"format_gl_data_format does not handle all cases.");
@@ -133,6 +138,8 @@ gfx::BufferFormat BufferFormat(ResourceFormat format) {
return gfx::BufferFormat::BGRA_8888;
case RED_8:
return gfx::BufferFormat::R_8;
+ case R16_EXT:
+ return gfx::BufferFormat::R_16;
case RGBA_4444:
return gfx::BufferFormat::RGBA_4444;
case RGBA_8888:
@@ -185,6 +192,7 @@ bool DoesResourceFormatSupportAlpha(ResourceFormat format) {
case ETC1:
case RED_8:
case LUMINANCE_F16:
+ case R16_EXT:
return false;
}
NOTREACHED();
« no previous file with comments | « components/viz/common/resources/resource_format.h ('k') | media/base/media_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698