diff options
author | mcasas <mcasas@chromium.org> | 2015-06-18 15:01:30 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-18 22:01:57 +0000 |
commit | e7fcf6081f365ae429fcbc6b3afe74b1ecd103c9 (patch) | |
tree | 21074fe46388bca9644690ea620cca5c417222e1 /media/base/video_frame.h | |
parent | ba836b2379ab2661b8cd678d34f16716225bd418 (diff) | |
download | chromium_src-e7fcf6081f365ae429fcbc6b3afe74b1ecd103c9.zip chromium_src-e7fcf6081f365ae429fcbc6b3afe74b1ecd103c9.tar.gz chromium_src-e7fcf6081f365ae429fcbc6b3afe74b1ecd103c9.tar.bz2 |
VideoCaptureDevice::Client::Buffer remove GetType() and changes signature of AsPlatformFile()
VideoCaptureDevice::Client::Buffer::GetType() is only
used twice, once for a DCHECK, violates layering and
is marked for deprecation, so this patch says Adios to
it.
AsPlatformFile() signature changes to return only for
OS_POSIX and a base::FileDescriptor, so the |fd|s can
be used for DuplicateFileDescriptors().
BUG=440843
TEST= All captures working exactly the same.
Review URL: https://codereview.chromium.org/1178013006
Cr-Commit-Position: refs/heads/master@{#335139}
Diffstat (limited to 'media/base/video_frame.h')
-rw-r--r-- | media/base/video_frame.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/base/video_frame.h b/media/base/video_frame.h index 1eaf4c3..9d97848 100644 --- a/media/base/video_frame.h +++ b/media/base/video_frame.h @@ -349,8 +349,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> { bool DuplicateFileDescriptors(const std::vector<int>& fds_in); #endif - void AddSharedMemoryHandle(base::SharedMemoryHandle handle, - size_t shared_memory_offset); + void AddSharedMemoryHandle(base::SharedMemoryHandle handle); #if defined(OS_MACOSX) // Returns the backing CVPixelBuffer, if present. |