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

Unified Diff: device/capture/video/mac/video_capture_device_decklink_mac.mm

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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: device/capture/video/mac/video_capture_device_decklink_mac.mm
diff --git a/media/capture/video/mac/video_capture_device_decklink_mac.mm b/device/capture/video/mac/video_capture_device_decklink_mac.mm
similarity index 97%
rename from media/capture/video/mac/video_capture_device_decklink_mac.mm
rename to device/capture/video/mac/video_capture_device_decklink_mac.mm
index 54bb0ccde568fb563bbc9f8faffed7bc44c8fa1f..ee09374541c42963f7b8f44e9498012028dc83e1 100644
--- a/media/capture/video/mac/video_capture_device_decklink_mac.mm
+++ b/device/capture/video/mac/video_capture_device_decklink_mac.mm
@@ -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 "media/capture/video/mac/video_capture_device_decklink_mac.h"
+#include "device/capture/video/mac/video_capture_device_decklink_mac.h"
#include <utility>
@@ -48,8 +48,8 @@ class DeckLinkCaptureDelegate
public base::RefCountedThreadSafe<DeckLinkCaptureDelegate> {
public:
DeckLinkCaptureDelegate(
- const media::VideoCaptureDeviceDescriptor& device_descriptor,
- media::VideoCaptureDeviceDeckLinkMac* frame_receiver);
+ const device::VideoCaptureDeviceDescriptor& device_descriptor,
+ device::VideoCaptureDeviceDeckLinkMac* frame_receiver);
void AllocateAndStart(const media::VideoCaptureParams& params);
void StopAndDeAllocate();
@@ -79,14 +79,14 @@ class DeckLinkCaptureDelegate
// Forwarder to VideoCaptureDeviceDeckLinkMac::SendLogString().
void SendLogString(const std::string& message);
- const media::VideoCaptureDeviceDescriptor device_descriptor_;
+ const device::VideoCaptureDeviceDescriptor device_descriptor_;
// Protects concurrent setting and using of |frame_receiver_|.
base::Lock lock_;
// Weak reference to the captured frames client, used also for error messages
// and logging. Initialized on construction and used until cleared by calling
// ResetVideoCaptureDeviceReference().
- media::VideoCaptureDeviceDeckLinkMac* frame_receiver_;
+ device::VideoCaptureDeviceDeckLinkMac* frame_receiver_;
// This is used to control the video capturing device input interface.
ScopedDeckLinkPtr<IDeckLinkInput> decklink_input_;
@@ -124,8 +124,8 @@ static float GetDisplayModeFrameRate(
}
DeckLinkCaptureDelegate::DeckLinkCaptureDelegate(
- const media::VideoCaptureDeviceDescriptor& device_descriptor,
- media::VideoCaptureDeviceDeckLinkMac* frame_receiver)
+ const device::VideoCaptureDeviceDescriptor& device_descriptor,
+ device::VideoCaptureDeviceDeckLinkMac* frame_receiver)
: device_descriptor_(device_descriptor), frame_receiver_(frame_receiver) {}
DeckLinkCaptureDelegate::~DeckLinkCaptureDelegate() {
@@ -330,7 +330,7 @@ void DeckLinkCaptureDelegate::ResetVideoCaptureDeviceReference() {
} // namespace
-namespace media {
+namespace device {
static std::string JoinDeviceNameAndFormat(CFStringRef name,
CFStringRef format) {
@@ -445,7 +445,7 @@ void VideoCaptureDeviceDeckLinkMac::EnumerateDeviceCapabilities(
const media::VideoCaptureFormat format(
gfx::Size(display_mode->GetWidth(), display_mode->GetHeight()),
GetDisplayModeFrameRate(display_mode),
- PIXEL_FORMAT_UNKNOWN);
+ media::PIXEL_FORMAT_UNKNOWN);
supported_formats->push_back(format);
DVLOG(2) << device.display_name << " "
<< VideoCaptureFormat::ToString(format);
@@ -508,4 +508,4 @@ void VideoCaptureDeviceDeckLinkMac::StopAndDeAllocate() {
decklink_capture_delegate_->StopAndDeAllocate();
}
-} // namespace media
+} // namespace device

Powered by Google App Engine
This is Rietveld 408576698