| Index: media/base/video_frame.h
|
| diff --git a/media/base/video_frame.h b/media/base/video_frame.h
|
| index 8a63cd3513fa888e95c639c7648e915244d9d5dc..b51bfe96d2dc5e94dd066c5c47eb0f3acc0b4b67 100644
|
| --- a/media/base/video_frame.h
|
| +++ b/media/base/video_frame.h
|
| @@ -44,9 +44,9 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
|
| YV16 = 2, // 16bpp YVU planar 1x1 Y, 2x1 VU samples
|
| I420 = 3, // 12bpp YVU planar 1x1 Y, 2x2 UV samples.
|
| YV12A = 4, // 20bpp YUVA planar 1x1 Y, 2x2 VU, 1x1 A samples.
|
| -#if defined(GOOGLE_TV)
|
| +#if defined(VIDEO_HOLE)
|
| HOLE = 5, // Hole frame.
|
| -#endif
|
| +#endif // defined(VIDEO_HOLE)
|
| NATIVE_TEXTURE = 6, // Native texture. Pixel-format agnostic.
|
| YV12J = 7, // JPEG color range version of YV12
|
| HISTOGRAM_MAX, // Must always be greatest.
|
| @@ -188,10 +188,10 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
|
| // equivalent of RGB(0,0,0).
|
| static scoped_refptr<VideoFrame> CreateBlackFrame(const gfx::Size& size);
|
|
|
| -#if defined(GOOGLE_TV)
|
| +#if defined(VIDEO_HOLE)
|
| // Allocates a hole frame.
|
| static scoped_refptr<VideoFrame> CreateHoleFrame(const gfx::Size& size);
|
| -#endif
|
| +#endif // defined(VIDEO_HOLE)
|
|
|
| static size_t NumPlanes(Format format);
|
|
|
|
|