Make NumPlanes() a member of media::VideoFrame

Since plane count is a property of media::VideoFrame::Format, it should
live where the format is defined.

BUG=chromium:167417
BUG=chromium-os:38376
TEST=local build and run on CrOS, desktop linux

Change-Id: I7cddc73ee84f6746568ce71a7f9f252489634d3a


Review URL: https://chromiumcodereview.appspot.com/12517002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186628 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 34 insertions, 39 deletions

diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc
index 502ccc2..c5cef47 100644
--- a/cc/video_layer_impl.cc
+++ b/cc/video_layer_impl.cc
@@ -115,25 +115,7 @@ size_t VideoLayerImpl::numPlanes() const
     if (m_convertYUV)
         return 1;
 
-    switch (m_frame->format()) {
-#if defined(GOOGLE_TV)
-    case media::VideoFrame::HOLE:
-        return 0;
-#endif
-    case media::VideoFrame::RGB32:
-        return 1;
-    case media::VideoFrame::YV12:
-    case media::VideoFrame::YV16:
-        return 3;
-    case media::VideoFrame::INVALID:
-    case media::VideoFrame::EMPTY:
-    case media::VideoFrame::I420:
-        break;
-    case media::VideoFrame::NATIVE_TEXTURE:
-        return 0;
-    }
-    NOTREACHED();
-    return 0;
+    return media::VideoFrame::NumPlanes(m_frame->format());
 }
 
 void VideoLayerImpl::willDraw(ResourceProvider* resourceProvider)
@@ -436,7 +418,7 @@ void VideoLayerImpl::freePlaneData(ResourceProvider* resourceProvider)
 
 void VideoLayerImpl::freeUnusedPlaneData(ResourceProvider* resourceProvider)
 {
-    size_t firstUnusedPlane = numPlanes();
+    const size_t firstUnusedPlane = numPlanes();
     for (size_t i = firstUnusedPlane; i < media::VideoFrame::kMaxPlanes; ++i)
         m_framePlanes[i].freeData(resourceProvider);
 }
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index b5330bd..70b77fb 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -136,6 +136,13 @@ scoped_refptr<VideoFrame> VideoFrame::CreateBlackFrame(const gfx::Size& size) {
 }
 
 #if defined(GOOGLE_TV)
+// This block and other blocks wrapped around #if defined(GOOGLE_TV) is not
+// maintained by the general compositor team. Please contact the following
+// people instead:
+//
+// wonsik@chromium.org
+// ycheo@chromium.org
+
 // static
 scoped_refptr<VideoFrame> VideoFrame::CreateHoleFrame(
     const gfx::Size& size) {
@@ -146,6 +153,28 @@ scoped_refptr<VideoFrame> VideoFrame::CreateHoleFrame(
 }
 #endif
 
+// static
+size_t VideoFrame::NumPlanes(Format format) {
+  switch (format) {
+    case VideoFrame::NATIVE_TEXTURE:
+#if defined(GOOGLE_TV)
+    case VideoFrame::HOLE:
+#endif
+      return 0;
+    case VideoFrame::RGB32:
+      return 1;
+    case VideoFrame::YV12:
+    case VideoFrame::YV16:
+      return 3;
+    case VideoFrame::EMPTY:
+    case VideoFrame::I420:
+    case VideoFrame::INVALID:
+      break;
+  }
+  NOTREACHED() << "Unsupported video frame format: " << format;
+  return 0;
+}
+
 static inline size_t RoundUp(size_t value, size_t alignment) {
   // Check that |alignment| is a power of 2.
   DCHECK((alignment + (alignment - 1)) == (alignment | (alignment - 1)));
@@ -236,25 +265,7 @@ VideoFrame::~VideoFrame() {
 }
 
 bool VideoFrame::IsValidPlane(size_t plane) const {
-  switch (format_) {
-    case RGB32:
-      return plane == kRGBPlane;
-
-    case YV12:
-    case YV16:
-      return plane == kYPlane || plane == kUPlane || plane == kVPlane;
-
-    case NATIVE_TEXTURE:
-      NOTREACHED() << "NATIVE_TEXTUREs don't use plane-related methods!";
-      return false;
-
-    default:
-      break;
-  }
-
-  // Intentionally leave out non-production formats.
-  NOTREACHED() << "Unsupported video frame format: " << format_;
-  return false;
+  return (plane < NumPlanes(format_));
 }
 
 int VideoFrame::stride(size_t plane) const {
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index 07697c2..9a259b4 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -133,6 +133,8 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
   static scoped_refptr<VideoFrame> CreateHoleFrame(const gfx::Size& size);
 #endif
 
+  static size_t NumPlanes(Format format);
+
   Format format() const { return format_; }
 
   const gfx::Size& coded_size() const { return coded_size_; }