admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support different capture resolutions in new video_loopback.

Browse Source 
Bug: webrtc:10391
Change-Id: I0732dade47d18c4d8c65eef2a4011b87caf2e7c5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126800
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27131}
This commit is contained in:
Kári Tristan Helgason 2019-03-13 11:18:44 +01:00 committed by Commit Bot
parent 1ddc7634fd
commit 10db597e76
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/mac_capturer.mm
View File

@ -35,6 +35,27 @@
@end
namespace {
AVCaptureDeviceFormat *SelectClosestFormat(AVCaptureDevice *device, size_t width, size_t height) {
NSArray<AVCaptureDeviceFormat *> *formats =
[RTCCameraVideoCapturer supportedFormatsForDevice:device];
AVCaptureDeviceFormat *selectedFormat = nil;
int currentDiff = INT_MAX;
for (AVCaptureDeviceFormat *format in formats) {
CMVideoDimensions dimension = CMVideoFormatDescriptionGetDimensions(format.formatDescription);
int diff =
std::abs((int64_t)width - dimension.width) + std::abs((int64_t)height - dimension.height);
if (diff < currentDiff) {
selectedFormat = format;
currentDiff = diff;
}
}
return selectedFormat;
}
} // namespace
namespace webrtc {
namespace test {
@ -51,8 +72,7 @@ MacCapturer::MacCapturer(size_t width,
AVCaptureDevice *device =
[[RTCCameraVideoCapturer captureDevices] objectAtIndex:capture_device_index];
AVCaptureDeviceFormat *format =
[[RTCCameraVideoCapturer supportedFormatsForDevice:device] objectAtIndex:0];
AVCaptureDeviceFormat *format = SelectClosestFormat(device, width, height);
[capturer startCaptureWithDevice:device format:format fps:target_fps];
}