Merge 78787 - 2011-02-16 Victoria Kirst <vrk@google.com>...

Source/WebKit/chromium/src/VideoFrameChromiumImpl.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 54 matching lines @@
     return Invalid;
 }
 
 unsigned VideoFrameChromiumImpl::width() const
 {
     if (m_webVideoFrame)
         return m_webVideoFrame->width();
     return 0;
 }
 
+unsigned VideoFrameChromiumImpl::width(unsigned plane) const
+{
+    unsigned planeWidth = width();
+    if (format() == YV12 && plane != static_cast<unsigned>(yPlane))
+        planeWidth /= 2;
+    return planeWidth;
+}
+
 unsigned VideoFrameChromiumImpl::height() const
 {
     if (m_webVideoFrame)
         return m_webVideoFrame->height();
     return 0;
 }
 
+unsigned VideoFrameChromiumImpl::height(unsigned plane) const
+{
+    unsigned planeHeight = height();
+    if (format() == YV12 && plane != static_cast<unsigned>(yPlane))
+        planeHeight /= 2;
+    return planeHeight;
+}
+
 unsigned VideoFrameChromiumImpl::planes() const
 {
     if (m_webVideoFrame)
         return m_webVideoFrame->planes();
     return 0;
 }
 
 int VideoFrameChromiumImpl::stride(unsigned plane) const
 {
     if (m_webVideoFrame)
@@ skipping 10 matching lines @@
 
 unsigned VideoFrameChromiumImpl::texture(unsigned plane) const
 {
     if (m_webVideoFrame)
         return m_webVideoFrame->texture(plane);
     return 0;
 }
 
 const IntSize VideoFrameChromiumImpl::requiredTextureSize(unsigned plane) const
 {
-    switch (format()) {
-    case RGBA:
-    case YV16:
-        return IntSize(stride(plane), height());
-    case YV12:
-        if (plane == static_cast<unsigned>(yPlane))
-            return IntSize(stride(plane), height());
-        else if (plane == static_cast<unsigned>(uPlane))
-            return IntSize(stride(plane), height() / 2);
-        else if (plane == static_cast<unsigned>(vPlane))
-            return IntSize(stride(plane), height() / 2);
-    default:
-        break;
-    }
-    return IntSize();
+    return IntSize(stride(plane), height(plane));
+}
+
+bool VideoFrameChromiumImpl::hasPaddingBytes(unsigned plane) const
+{
+    if (m_webVideoFrame)
+        return stride(plane) - width(plane) > 0;
+    return false;
 }
 
 } // namespace WebKit