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

Unified Diff: media/base/video_frame.h

Issue 110683002: Split the hole punching logic from GOOGLE_TV ifdef to VIDEO_HOLE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years 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 | « content/renderer/media/android/webmediaplayer_android.cc ('k') | media/base/video_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | media/base/video_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698