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

Unified Diff: media/base/video_frame.h

Issue 2781283002: Rename functions in video frame to comply with Style Guide (Closed)
Patch Set: Fixed compilation errors for MAC Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/mac/video_frame_mac_unittests.cc ('k') | media/base/video_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_frame.h
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index 0ae2d706ca7e7a4fd4730d0fac5aa8d52f8e2050..af488adfa8441cc087dd4affdaac51c2f8e537ef 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -63,8 +63,10 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer.
STORAGE_SHMEM = 4, // Pixels are backed by Shared Memory.
#if defined(OS_LINUX)
- // TODO(mcasas): Consider turning this type into STORAGE_NATIVE or another
- // meaningful name and handle it appropriately in all cases.
+ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE
+ // based on the idea of using this same enum value for both DMA
+ // buffers on Linux and CVPixelBuffers on Mac (which currently use
+ // STORAGE_UNOWNED_MEMORY) and handle it appropriately in all cases.
STORAGE_DMABUFS = 5, // Each plane is stored into a DmaBuf.
#endif
STORAGE_MOJO_SHARED_BUFFER = 6,
@@ -339,8 +341,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
#if defined(OS_LINUX)
// Returns backing DmaBuf file descriptor for given |plane|, if present, or
// -1 if not.
- // TODO(mcasas): Rename to DmabufFd() to comply with Style Guide.
- int dmabuf_fd(size_t plane) const;
+ int DmabufFd(size_t plane) const;
// Duplicates internally the |fds_in|, overwriting the current ones. Returns
// false if something goes wrong, and leaves all internal fds closed.
@@ -351,8 +352,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
#if defined(OS_MACOSX)
// Returns the backing CVPixelBuffer, if present.
- // TODO(mcasas): Rename to CvPixelBuffer() to comply with Style Guide.
- CVPixelBufferRef cv_pixel_buffer() const;
+ CVPixelBufferRef CvPixelBuffer() const;
#endif
// Sets the mailbox release callback.
« no previous file with comments | « media/base/mac/video_frame_mac_unittests.cc ('k') | media/base/video_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698