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

Unified Diff: webrtc/modules/video_capture/ios/video_capture_ios.mm

Issue 2375273004: Reland of Unify the macOS and iOS capturer implementations (Closed)
Patch Set: fix gyp build 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: webrtc/modules/video_capture/ios/video_capture_ios.mm
diff --git a/webrtc/modules/video_capture/ios/video_capture_ios.mm b/webrtc/modules/video_capture/ios/video_capture_ios.mm
deleted file mode 100644
index 7a1f17bd13f75290a4439f26a2a331e843bfe298..0000000000000000000000000000000000000000
--- a/webrtc/modules/video_capture/ios/video_capture_ios.mm
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/modules/video_capture/ios/device_info_ios_objc.h"
-#include "webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h"
-#include "webrtc/system_wrappers/include/trace.h"
-
-using namespace webrtc;
-using namespace videocapturemodule;
-
-rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create(
- const int32_t capture_id,
- const char* deviceUniqueIdUTF8) {
- return VideoCaptureIos::Create(capture_id, deviceUniqueIdUTF8);
-}
-
-VideoCaptureIos::VideoCaptureIos(const int32_t capture_id)
- : VideoCaptureImpl(capture_id), is_capturing_(false), id_(capture_id) {
- capability_.width = kDefaultWidth;
- capability_.height = kDefaultHeight;
- capability_.maxFPS = kDefaultFrameRate;
- capture_device_ = nil;
-}
-
-VideoCaptureIos::~VideoCaptureIos() {
- if (is_capturing_) {
- [capture_device_ stopCapture];
- capture_device_ = nil;
- }
-}
-
-rtc::scoped_refptr<VideoCaptureModule> VideoCaptureIos::Create(
- const int32_t capture_id,
- const char* deviceUniqueIdUTF8) {
- if (!deviceUniqueIdUTF8[0]) {
- return NULL;
- }
-
- rtc::scoped_refptr<VideoCaptureIos> capture_module(
- new rtc::RefCountedObject<VideoCaptureIos>(capture_id));
-
- const int32_t name_length = strlen(deviceUniqueIdUTF8);
- if (name_length > kVideoCaptureUniqueNameLength)
- return nullptr;
-
- capture_module->_deviceUniqueId = new char[name_length + 1];
- strncpy(capture_module->_deviceUniqueId, deviceUniqueIdUTF8, name_length + 1);
- capture_module->_deviceUniqueId[name_length] = '\0';
-
- capture_module->capture_device_ =
- [[RTCVideoCaptureIosObjC alloc] initWithOwner:capture_module
- captureId:capture_module->id_];
- if (!capture_module->capture_device_) {
- return nullptr;
- }
-
- if (![capture_module->capture_device_ setCaptureDeviceByUniqueId:[
- [NSString alloc] initWithCString:deviceUniqueIdUTF8
- encoding:NSUTF8StringEncoding]]) {
- return nullptr;
- }
- return capture_module;
-}
-
-int32_t VideoCaptureIos::StartCapture(
- const VideoCaptureCapability& capability) {
- capability_ = capability;
-
- if (![capture_device_ startCaptureWithCapability:capability]) {
- return -1;
- }
-
- is_capturing_ = true;
-
- return 0;
-}
-
-int32_t VideoCaptureIos::StopCapture() {
- if (![capture_device_ stopCapture]) {
- return -1;
- }
-
- is_capturing_ = false;
- return 0;
-}
-
-bool VideoCaptureIos::CaptureStarted() { return is_capturing_; }
-
-int32_t VideoCaptureIos::CaptureSettings(VideoCaptureCapability& settings) {
- settings = capability_;
- settings.rawType = kVideoNV12;
- return 0;
-}
« no previous file with comments | « webrtc/modules/video_capture/ios/video_capture_ios.h ('k') | webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698