Changeset 140167 in webkit


Ignore:
Timestamp:
Jan 18, 2013 9:50:33 AM (11 years ago)
Author:
commit-queue@webkit.org
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 <webkit.review.bot@gmail.com> 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):

Location:
trunk/Source/Platform
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/Platform/ChangeLog

    r140158 r140167  
     12013-01-18  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r140158.
     4        http://trac.webkit.org/changeset/140158
     5        https://bugs.webkit.org/show_bug.cgi?id=107297
     6
     7        Broke android build (Requested by danakj on #webkit).
     8
     9        * chromium/public/WebVideoFrame.h:
     10        (WebKit):
     11        (WebKit::WebVideoFrame::format):
     12        (WebKit::WebVideoFrame::width):
     13        (WebKit::WebVideoFrame::height):
     14        (WebKit::WebVideoFrame::planes):
     15        (WebKit::WebVideoFrame::stride):
     16        (WebKit::WebVideoFrame::data):
     17        (WebKit::WebVideoFrame::textureId):
     18        (WebKit::WebVideoFrame::textureTarget):
     19        (WebKit::WebVideoFrame::visibleRect):
     20        (WebKit::WebVideoFrame::textureSize):
     21
    1222013-01-18  Dana Jansens  <danakj@chromium.org>
    223
  • trunk/Source/Platform/chromium/public/WebVideoFrame.h

    r140158 r140167  
    3737namespace WebKit {
    3838
    39 // A base class for the container which holds a media::VideoFrame.
     39// A proxy video frame interface to communicate frame data between chromium
     40// and WebKit.
     41// Keep in sync with chromium's media::VideoFrame::Format.
    4042class WebVideoFrame {
    4143public:
     44    enum {
     45        rgbPlane = 0,
     46        numRGBPlanes = 1
     47    };
     48    enum {
     49        yPlane = 0,
     50        uPlane = 1,
     51        vPlane = 2,
     52        numYUVPlanes = 3
     53    };
     54    enum { maxPlanes = 3 };
     55
     56    enum Format {
     57        FormatInvalid = 0,
     58        FormatRGB32 = 4,
     59        FormatYV12 = 6,
     60        FormatYV16 = 7,
     61        FormatEmpty = 9,
     62        FormatI420 = 11,
     63        FormatNativeTexture = 12,
     64    };
     65
    4266    virtual ~WebVideoFrame() { }
     67    virtual Format format() const { return FormatInvalid; }
     68    virtual unsigned width() const { return 0; }
     69    virtual unsigned height() const { return 0; }
     70    virtual unsigned planes() const { return 0; }
     71    virtual int stride(unsigned plane) const { return 0; }
     72    virtual const void* data(unsigned plane) const { return 0; }
     73    virtual unsigned textureId() const { return 0; }
     74    virtual unsigned textureTarget() const { return 0; }
     75    virtual WebKit::WebRect visibleRect() const { return WebKit::WebRect(); }
     76    virtual WebKit::WebSize textureSize() const { return WebKit::WebSize(); }
    4377};
    4478
Note: See TracChangeset for help on using the changeset viewer.