Title: [140167] trunk/Source/Platform
- Revision
- 140167
- Author
- [email protected]
- Date
- 2013-01-18 09:50:33 -0800 (Fri, 18 Jan 2013)
Log Message
Unreviewed, rolling out r140158.
http://trac.webkit.org/changeset/140158
https://bugs.webkit.org/show_bug.cgi?id=107297
Broke android build (Requested by danakj on #webkit).
Patch by Sheriff Bot <[email protected]> on 2013-01-18
* chromium/public/WebVideoFrame.h:
(WebKit):
(WebKit::WebVideoFrame::format):
(WebKit::WebVideoFrame::width):
(WebKit::WebVideoFrame::height):
(WebKit::WebVideoFrame::planes):
(WebKit::WebVideoFrame::stride):
(WebKit::WebVideoFrame::data):
(WebKit::WebVideoFrame::textureId):
(WebKit::WebVideoFrame::textureTarget):
(WebKit::WebVideoFrame::visibleRect):
(WebKit::WebVideoFrame::textureSize):
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (140166 => 140167)
--- trunk/Source/Platform/ChangeLog 2013-01-18 17:48:24 UTC (rev 140166)
+++ trunk/Source/Platform/ChangeLog 2013-01-18 17:50:33 UTC (rev 140167)
@@ -1,3 +1,24 @@
+2013-01-18 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r140158.
+ http://trac.webkit.org/changeset/140158
+ https://bugs.webkit.org/show_bug.cgi?id=107297
+
+ Broke android build (Requested by danakj on #webkit).
+
+ * chromium/public/WebVideoFrame.h:
+ (WebKit):
+ (WebKit::WebVideoFrame::format):
+ (WebKit::WebVideoFrame::width):
+ (WebKit::WebVideoFrame::height):
+ (WebKit::WebVideoFrame::planes):
+ (WebKit::WebVideoFrame::stride):
+ (WebKit::WebVideoFrame::data):
+ (WebKit::WebVideoFrame::textureId):
+ (WebKit::WebVideoFrame::textureTarget):
+ (WebKit::WebVideoFrame::visibleRect):
+ (WebKit::WebVideoFrame::textureSize):
+
2013-01-18 Dana Jansens <[email protected]>
[chromium] Remove the contents of WebVideoFrame class
Modified: trunk/Source/Platform/chromium/public/WebVideoFrame.h (140166 => 140167)
--- trunk/Source/Platform/chromium/public/WebVideoFrame.h 2013-01-18 17:48:24 UTC (rev 140166)
+++ trunk/Source/Platform/chromium/public/WebVideoFrame.h 2013-01-18 17:50:33 UTC (rev 140167)
@@ -36,10 +36,44 @@
namespace WebKit {
-// A base class for the container which holds a media::VideoFrame.
+// A proxy video frame interface to communicate frame data between chromium
+// and WebKit.
+// Keep in sync with chromium's media::VideoFrame::Format.
class WebVideoFrame {
public:
+ enum {
+ rgbPlane = 0,
+ numRGBPlanes = 1
+ };
+ enum {
+ yPlane = 0,
+ uPlane = 1,
+ vPlane = 2,
+ numYUVPlanes = 3
+ };
+ enum { maxPlanes = 3 };
+
+ enum Format {
+ FormatInvalid = 0,
+ FormatRGB32 = 4,
+ FormatYV12 = 6,
+ FormatYV16 = 7,
+ FormatEmpty = 9,
+ FormatI420 = 11,
+ FormatNativeTexture = 12,
+ };
+
virtual ~WebVideoFrame() { }
+ virtual Format format() const { return FormatInvalid; }
+ virtual unsigned width() const { return 0; }
+ virtual unsigned height() const { return 0; }
+ virtual unsigned planes() const { return 0; }
+ virtual int stride(unsigned plane) const { return 0; }
+ virtual const void* data(unsigned plane) const { return 0; }
+ virtual unsigned textureId() const { return 0; }
+ virtual unsigned textureTarget() const { return 0; }
+ virtual WebKit::WebRect visibleRect() const { return WebKit::WebRect(); }
+ virtual WebKit::WebSize textureSize() const { return WebKit::WebSize(); }
};
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
