Fix no_global_constructors in modules/video_capture.

Bug: webrtc:9693
Change-Id: Ia917ab824f18991cfdcffa04ea9c063c6a224532
Reviewed-on: https://webrtc-review.googlesource.com/98640
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24641}
This commit is contained in:
Mirko Bonadei 2018-09-06 16:28:07 +02:00 committed by Commit Bot
parent 211856b956
commit 76dac9ac2f
2 changed files with 5 additions and 8 deletions

View File

@ -71,8 +71,6 @@ if (!build_with_chromium) {
rtc_source_set("video_capture_internal_impl_objc") {
visibility = [ ":video_capture_internal_impl" ]
configs += [ "../..:no_global_constructors" ]
deps = [
":video_capture_module",
"../../rtc_base:rtc_base_approved",

View File

@ -24,12 +24,6 @@
using namespace webrtc;
using namespace videocapturemodule;
static NSArray* camera_presets = @[
AVCaptureSessionPreset352x288,
AVCaptureSessionPreset640x480,
AVCaptureSessionPreset1280x720
];
#define IOS_UNSUPPORTED() \
RTC_LOG(LS_ERROR) << __FUNCTION__ << " is not supported on the iOS platform."; \
return -1;
@ -47,6 +41,11 @@ DeviceInfoIos::~DeviceInfoIos() {}
int32_t DeviceInfoIos::Init() {
// Fill in all device capabilities.
const NSArray* camera_presets = @[
AVCaptureSessionPreset352x288,
AVCaptureSessionPreset640x480,
AVCaptureSessionPreset1280x720
];
int deviceCount = [DeviceInfoIosObjC captureDeviceCount];
for (int i = 0; i < deviceCount; i++) {