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

Unified Diff: media/capture/video/video_capture_buffer_pool_impl.cc

Issue 2361173002: Move classses VideoCaptureDeviceClient and VideoCaptureBufferPool to media/capture/video (Closed)
Patch Set: mcasas@ comments Created 4 years, 3 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
Index: media/capture/video/video_capture_buffer_pool_impl.cc
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool.cc b/media/capture/video/video_capture_buffer_pool_impl.cc
similarity index 94%
rename from content/browser/renderer_host/media/video_capture_buffer_pool.cc
rename to media/capture/video/video_capture_buffer_pool_impl.cc
index bc335a8c280aba95923caa31e17ede7a463b2d8b..cce7ef0bb747db45f440848d4d5abccd6156a061 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool.cc
+++ b/media/capture/video/video_capture_buffer_pool_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/renderer_host/media/video_capture_buffer_pool.h"
+#include "media/capture/video/video_capture_buffer_pool_impl.h"
#include <memory>
@@ -10,17 +10,19 @@
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "build/build_config.h"
-#include "content/browser/renderer_host/media/video_capture_buffer_handle.h"
-#include "content/browser/renderer_host/media/video_capture_buffer_tracker.h"
-#include "content/browser/renderer_host/media/video_capture_buffer_tracker_factory.h"
+#include "media/capture/video/video_capture_buffer_handle.h"
+#include "media/capture/video/video_capture_buffer_tracker.h"
#include "ui/gfx/buffer_format_util.h"
-namespace content {
+namespace media {
-VideoCaptureBufferPoolImpl::VideoCaptureBufferPoolImpl(int count)
+VideoCaptureBufferPoolImpl::VideoCaptureBufferPoolImpl(
+ std::unique_ptr<VideoCaptureBufferTrackerFactory> buffer_tracker_factory,
+ int count)
: count_(count),
next_buffer_id_(0),
- last_relinquished_buffer_id_(kInvalidId) {
+ last_relinquished_buffer_id_(kInvalidId),
+ buffer_tracker_factory_(std::move(buffer_tracker_factory)) {
DCHECK_GT(count, 0);
}
@@ -236,7 +238,7 @@ int VideoCaptureBufferPoolImpl::ReserveForProducerInternal(
const int buffer_id = next_buffer_id_++;
std::unique_ptr<VideoCaptureBufferTracker> tracker =
- VideoCaptureBufferTrackerFactory::CreateTracker(storage_type);
+ buffer_tracker_factory_->CreateTracker(storage_type);
// TODO(emircan): We pass the lock here to solve GMB allocation issue, see
// crbug.com/545238.
if (!tracker->Init(dimensions, pixel_format, storage_type, &lock_)) {
@@ -256,4 +258,4 @@ VideoCaptureBufferTracker* VideoCaptureBufferPoolImpl::GetTracker(
return (it == trackers_.end()) ? NULL : it->second;
}
-} // namespace content
+} // namespace media
« no previous file with comments | « media/capture/video/video_capture_buffer_pool_impl.h ('k') | media/capture/video/video_capture_buffer_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698