diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 18:23:13 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 18:23:13 +0000 |
| commit | e89b871ca795e2df641750782e5091ca45b55d0f (patch) | |
| tree | 414ec7cd342428da430e97752c9e35542152f64d /media/base/video_frame.h | |
| parent | 358d746e4985f4ee63fc969cfabe4bb7e3e1c860 (diff) | |
| download | chromium_src-e89b871ca795e2df641750782e5091ca45b55d0f.zip chromium_src-e89b871ca795e2df641750782e5091ca45b55d0f.tar.gz chromium_src-e89b871ca795e2df641750782e5091ca45b55d0f.tar.bz2 | |
Split the hole punching logic from GOOGLE_TV #ifdef into VIDEO_HOLE
This CL splits the hole punching logic into another ifdef, so that the code can be reused by different parties and can be easily managed
See discussion: https://groups.google.com/a/google.com/forum/#!topic/chrome-gpu/eIM1RwarUmk
BUG=323157
Review URL: https://codereview.chromium.org/110683002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240365 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/video_frame.h')
| -rw-r--r-- | media/base/video_frame.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/base/video_frame.h b/media/base/video_frame.h index 8a63cd3..b51bfe9 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); |