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

Side by Side Diff: content/browser/renderer_host/media/video_capture_buffer_pool.cc

Issue 1215643003: Remove -Wno-unused-private-field clang warning suppression. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feedback Created 5 years, 5 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h" 5 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" 10 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
11 #include "content/common/gpu/client/gpu_memory_buffer_impl.h" 11 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 const int VideoCaptureBufferPool::kInvalidId = -1; 16 const int VideoCaptureBufferPool::kInvalidId = -1;
17 17
18 // A simple holder of a memory-backed buffer and accesors to it. 18 // A simple holder of a memory-backed buffer and accesors to it.
19 class SimpleBufferHandle final : public VideoCaptureBufferPool::BufferHandle { 19 class SimpleBufferHandle final : public VideoCaptureBufferPool::BufferHandle {
20 public: 20 public:
21 SimpleBufferHandle(void* data, size_t size, base::SharedMemoryHandle handle) 21 SimpleBufferHandle(void* data, size_t size, base::SharedMemoryHandle handle)
22 : data_(data), size_(size), handle_(handle) {} 22 : data_(data),
23 size_(size)
24 #if defined(OS_POSIX)
25 , handle_(handle)
26 #endif
27 {
28 }
23 ~SimpleBufferHandle() override {} 29 ~SimpleBufferHandle() override {}
24 30
25 size_t size() const override { return size_; } 31 size_t size() const override { return size_; }
26 void* data() override { return data_; } 32 void* data() override { return data_; }
27 ClientBuffer AsClientBuffer() override { return nullptr; } 33 ClientBuffer AsClientBuffer() override { return nullptr; }
28 #if defined(OS_POSIX) 34 #if defined(OS_POSIX)
29 base::FileDescriptor AsPlatformFile() override { 35 base::FileDescriptor AsPlatformFile() override {
30 #if defined(OS_MACOSX) 36 #if defined(OS_MACOSX)
31 return handle_.GetFileDescriptor(); 37 return handle_.GetFileDescriptor();
32 #else 38 #else
33 return handle_; 39 return handle_;
34 #endif // defined(OS_MACOSX) 40 #endif // defined(OS_MACOSX)
35 } 41 }
36 #endif 42 #endif
37 43
38 private: 44 private:
39 void* const data_; 45 void* const data_;
40 const size_t size_; 46 const size_t size_;
47 #if defined(OS_POSIX)
41 const base::SharedMemoryHandle handle_; 48 const base::SharedMemoryHandle handle_;
49 #endif
42 }; 50 };
43 51
44 // A holder of a GpuMemoryBuffer-backed buffer, Map()ed on ctor and Unmap()ed on 52 // A holder of a GpuMemoryBuffer-backed buffer, Map()ed on ctor and Unmap()ed on
45 // dtor. Holds a weak reference to its GpuMemoryBuffer. 53 // dtor. Holds a weak reference to its GpuMemoryBuffer.
46 // TODO(mcasas) Map()ed on ctor, or on first use? 54 // TODO(mcasas) Map()ed on ctor, or on first use?
47 class GpuMemoryBufferBufferHandle 55 class GpuMemoryBufferBufferHandle
48 final : public VideoCaptureBufferPool::BufferHandle { 56 final : public VideoCaptureBufferPool::BufferHandle {
49 public: 57 public:
50 GpuMemoryBufferBufferHandle(gfx::GpuMemoryBuffer* gmb, size_t size) 58 GpuMemoryBufferBufferHandle(gfx::GpuMemoryBuffer* gmb, size_t size)
51 : gmb_(gmb), 59 : gmb_(gmb),
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 return buffer_id; 370 return buffer_id;
363 } 371 }
364 372
365 VideoCaptureBufferPool::Tracker* VideoCaptureBufferPool::GetTracker( 373 VideoCaptureBufferPool::Tracker* VideoCaptureBufferPool::GetTracker(
366 int buffer_id) { 374 int buffer_id) {
367 TrackerMap::const_iterator it = trackers_.find(buffer_id); 375 TrackerMap::const_iterator it = trackers_.find(buffer_id);
368 return (it == trackers_.end()) ? NULL : it->second; 376 return (it == trackers_.end()) ? NULL : it->second;
369 } 377 }
370 378
371 } // namespace content 379 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698