| Index: cc/quads/yuv_video_draw_quad.h
|
| diff --git a/cc/quads/yuv_video_draw_quad.h b/cc/quads/yuv_video_draw_quad.h
|
| index 513938467ccd5d1252481327a3d3ac854190623e..b9db7b4bf2c2d566c856ddc4625364fdd58da416 100644
|
| --- a/cc/quads/yuv_video_draw_quad.h
|
| +++ b/cc/quads/yuv_video_draw_quad.h
|
| @@ -11,7 +11,6 @@
|
|
|
| #include "cc/cc_export.h"
|
| #include "cc/quads/draw_quad.h"
|
| -#include "ui/gfx/color_space.h"
|
| #include "ui/gfx/geometry/rect_f.h"
|
| #include "ui/gfx/geometry/size.h"
|
|
|
| @@ -26,13 +25,6 @@ class CC_EXPORT YUVVideoDrawQuad : public DrawQuad {
|
|
|
| enum : uint32_t { kMinBitsPerChannel = 8, kMaxBitsPerChannel = 24 };
|
|
|
| - enum ColorSpace {
|
| - REC_601, // SDTV standard with restricted "studio swing" color range.
|
| - REC_709, // HDTV standard with restricted "studio swing" color range.
|
| - JPEG, // Full color range [0, 255] JPEG color space.
|
| - COLOR_SPACE_LAST = JPEG
|
| - };
|
| -
|
| ~YUVVideoDrawQuad() override;
|
|
|
| YUVVideoDrawQuad();
|
| @@ -53,8 +45,6 @@ class CC_EXPORT YUVVideoDrawQuad : public DrawQuad {
|
| unsigned u_plane_resource_id,
|
| unsigned v_plane_resource_id,
|
| unsigned a_plane_resource_id,
|
| - ColorSpace color_space,
|
| - const gfx::ColorSpace& video_color_space,
|
| float offset,
|
| float multiplier,
|
| uint32_t bits_per_channel);
|
| @@ -75,8 +65,6 @@ class CC_EXPORT YUVVideoDrawQuad : public DrawQuad {
|
| unsigned u_plane_resource_id,
|
| unsigned v_plane_resource_id,
|
| unsigned a_plane_resource_id,
|
| - ColorSpace color_space,
|
| - const gfx::ColorSpace& video_color_space,
|
| float offset,
|
| float multiplier,
|
| uint32_t bits_per_channel);
|
| @@ -85,12 +73,9 @@ class CC_EXPORT YUVVideoDrawQuad : public DrawQuad {
|
| gfx::RectF uv_tex_coord_rect;
|
| gfx::Size ya_tex_size;
|
| gfx::Size uv_tex_size;
|
| - ColorSpace color_space;
|
| float resource_offset = 0.0f;
|
| float resource_multiplier = 1.0f;
|
| uint32_t bits_per_channel = 8;
|
| - // TODO(hubbe): Move to ResourceProvider::ScopedSamplerGL.
|
| - gfx::ColorSpace video_color_space;
|
|
|
| static const YUVVideoDrawQuad* MaterialCast(const DrawQuad*);
|
|
|
|
|