| Index: media/capture/video/shared_memory_buffer_tracker.cc
|
| diff --git a/media/capture/video/shared_memory_buffer_tracker.cc b/media/capture/video/shared_memory_buffer_tracker.cc
|
| index d21e35d7863f9005de4b08b04262f14f827678d9..2adfb0ef6efccc459aa0f92ce34c2ff9f79e24d9 100644
|
| --- a/media/capture/video/shared_memory_buffer_tracker.cc
|
| +++ b/media/capture/video/shared_memory_buffer_tracker.cc
|
| @@ -30,7 +30,7 @@ bool SharedMemoryBufferTracker::Init(const gfx::Size& dimensions,
|
| }
|
|
|
| std::unique_ptr<VideoCaptureBufferHandle>
|
| -SharedMemoryBufferTracker::GetBufferHandle() {
|
| +SharedMemoryBufferTracker::GetMemoryMappedAccess() {
|
| return base::MakeUnique<SharedMemoryBufferHandle>(this);
|
| }
|
|
|
| @@ -47,31 +47,16 @@ SharedMemoryBufferHandle::SharedMemoryBufferHandle(
|
|
|
| SharedMemoryBufferHandle::~SharedMemoryBufferHandle() = default;
|
|
|
| -gfx::Size SharedMemoryBufferHandle::dimensions() const {
|
| - return tracker_->dimensions();
|
| -}
|
| -
|
| size_t SharedMemoryBufferHandle::mapped_size() const {
|
| return tracker_->mapped_size_;
|
| }
|
|
|
| -void* SharedMemoryBufferHandle::data(int plane) {
|
| - DCHECK_EQ(0, plane);
|
| - return tracker_->shared_memory_.memory();
|
| -}
|
| -
|
| -#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| -base::FileDescriptor SharedMemoryBufferHandle::AsPlatformFile() {
|
| - return tracker_->shared_memory_.handle();
|
| -}
|
| -#endif
|
| -
|
| -bool SharedMemoryBufferHandle::IsBackedByVideoFrame() const {
|
| - return false;
|
| +uint8_t* SharedMemoryBufferHandle::data() {
|
| + return static_cast<uint8_t*>(tracker_->shared_memory_.memory());
|
| }
|
|
|
| -scoped_refptr<VideoFrame> SharedMemoryBufferHandle::GetVideoFrame() {
|
| - return scoped_refptr<VideoFrame>();
|
| +const uint8_t* SharedMemoryBufferHandle::data() const {
|
| + return static_cast<const uint8_t*>(tracker_->shared_memory_.memory());
|
| }
|
|
|
| } // namespace media
|
|
|