Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1096)

Side by Side Diff: Source/WebKit/chromium/src/VideoFrameChromiumImpl.h

Issue 6578030: Merge 78787 - 2011-02-16 Victoria Kirst <vrk@google.com>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | Source/WebKit/chromium/src/VideoFrameChromiumImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // Converts a WebCore::VideoFrameChromium to a WebKit::WebVideoFrame. 45 // Converts a WebCore::VideoFrameChromium to a WebKit::WebVideoFrame.
46 static WebVideoFrame* toWebVideoFrame(VideoFrameChromium*); 46 static WebVideoFrame* toWebVideoFrame(VideoFrameChromium*);
47 47
48 // Creates a VideoFrameChromiumImpl object to wrap the given WebVideoFrame. 48 // Creates a VideoFrameChromiumImpl object to wrap the given WebVideoFrame.
49 // The VideoFrameChromiumImpl does not take ownership of the WebVideoFrame 49 // The VideoFrameChromiumImpl does not take ownership of the WebVideoFrame
50 // and should not free the frame's memory. 50 // and should not free the frame's memory.
51 VideoFrameChromiumImpl(WebVideoFrame*); 51 VideoFrameChromiumImpl(WebVideoFrame*);
52 virtual SurfaceType surfaceType() const; 52 virtual SurfaceType surfaceType() const;
53 virtual Format format() const; 53 virtual Format format() const;
54 virtual unsigned width() const; 54 virtual unsigned width() const;
55 virtual unsigned width(unsigned plane) const;
55 virtual unsigned height() const; 56 virtual unsigned height() const;
57 virtual unsigned height(unsigned plane) const;
56 virtual unsigned planes() const; 58 virtual unsigned planes() const;
57 virtual int stride(unsigned plane) const; 59 virtual int stride(unsigned plane) const;
58 virtual const void* data(unsigned plane) const; 60 virtual const void* data(unsigned plane) const;
59 virtual unsigned texture(unsigned plane) const; 61 virtual unsigned texture(unsigned plane) const;
60 virtual const IntSize requiredTextureSize(unsigned plane) const; 62 virtual const IntSize requiredTextureSize(unsigned plane) const;
63 virtual bool hasPaddingBytes(unsigned plane) const;
61 64
62 private: 65 private:
63 WebVideoFrame* m_webVideoFrame; 66 WebVideoFrame* m_webVideoFrame;
64 }; 67 };
65 68
66 } // namespace WebKit 69 } // namespace WebKit
67 70
68 #endif 71 #endif
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | Source/WebKit/chromium/src/VideoFrameChromiumImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698