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

Add dimensions to video settings in objc sdk camera backend.

Browse Source 
This is required by some virtual cameras, like Snap Camera from
Snapchat.

Bug: webrtc:14783
Change-Id: I3d841936c17f3f227af9a94a4c3b0f37940d43b2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288361
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39073}
This commit is contained in:
Andreas Pehrson 2022-12-19 17:23:51 +01:00 committed by WebRTC LUCI CQ
parent b081042eec
commit d100a589c8
2 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdk/objc/components/capturer/RTCCameraVideoCapturer.m
View File

@ -476,9 +476,16 @@ const int64_t kNanosecondsPerSecond = 1000000000;
if (mediaSubType != _outputPixelFormat) { if (mediaSubType != _outputPixelFormat) {
_outputPixelFormat = mediaSubType; _outputPixelFormat = mediaSubType;
_videoDataOutput.videoSettings =
@{ (NSString *)kCVPixelBufferPixelFormatTypeKey : @(mediaSubType) };
} }
// Update videoSettings with dimensions, as some virtual cameras, e.g. Snap Camera, may not work
// otherwise.
CMVideoDimensions dimensions = CMVideoFormatDescriptionGetDimensions(format.formatDescription);
_videoDataOutput.videoSettings = @{
(id)kCVPixelBufferWidthKey : @(dimensions.width),
(id)kCVPixelBufferHeightKey : @(dimensions.height),
(id)kCVPixelBufferPixelFormatTypeKey : @(_outputPixelFormat),
};
} }
#pragma mark - Private, called inside capture queue #pragma mark - Private, called inside capture queue

49
sdk/objc/unittests/RTCCameraVideoCapturerTests.mm
View File

@ -517,4 +517,53 @@ CMSampleBufferRef createTestSampleBufferRef() {
XCTAssertEqual(callbackError, errorMock); XCTAssertEqual(callbackError, errorMock);
} }
- (void)testStartCaptureSetsOutputDimensionsInvalidPixelFormat {
id expectedDeviceInputMock = OCMClassMock([AVCaptureDeviceInput class]);
id captureDeviceInputMock = OCMClassMock([AVCaptureDeviceInput class]);
OCMStub([captureDeviceInputMock deviceInputWithDevice:_deviceMock error:[OCMArg setTo:nil]])
.andReturn(expectedDeviceInputMock);
OCMStub([_deviceMock lockForConfiguration:[OCMArg setTo:nil]]).andReturn(YES);
OCMStub([_deviceMock unlockForConfiguration]);
OCMStub([_captureSessionMock canAddInput:expectedDeviceInputMock]).andReturn(YES);
OCMStub([_captureSessionMock addInput:expectedDeviceInputMock]);
OCMStub([_captureSessionMock inputs]).andReturn(@[ expectedDeviceInputMock ]);
OCMStub([_captureSessionMock removeInput:expectedDeviceInputMock]);
OCMStub([_captureSessionMock startRunning]);
OCMStub([_captureSessionMock stopRunning]);
id deviceFormatMock = OCMClassMock([AVCaptureDeviceFormat class]);
CMVideoFormatDescriptionRef formatDescription;
int width = 110;
int height = 220;
FourCharCode pixelFormat = 0x18000000;
CMVideoFormatDescriptionCreate(nil, pixelFormat, width, height, nil, &formatDescription);
OCMStub([deviceFormatMock formatDescription]).andReturn(formatDescription);
[_capturer startCaptureWithDevice:_deviceMock format:deviceFormatMock fps:30];
XCTestExpectation *expectation = [self expectationWithDescription:@"StopCompletion"];
[_capturer stopCaptureWithCompletionHandler:^(void) {
[expectation fulfill];
}];
[self waitForExpectationsWithTimeout:15 handler:nil];
OCMVerify([_captureSessionMock
addOutput:[OCMArg checkWithBlock:^BOOL(AVCaptureVideoDataOutput *output) {
if (@available(iOS 16, *)) {
XCTAssertEqual(width, [output.videoSettings[(id)kCVPixelBufferWidthKey] intValue]);
XCTAssertEqual(height, [output.videoSettings[(id)kCVPixelBufferHeightKey] intValue]);
} else {
XCTAssertEqual(0, [output.videoSettings[(id)kCVPixelBufferWidthKey] intValue]);
XCTAssertEqual(0, [output.videoSettings[(id)kCVPixelBufferHeightKey] intValue]);
}
XCTAssertEqual(
(FourCharCode)kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange,
[output.videoSettings[(id)kCVPixelBufferPixelFormatTypeKey] unsignedIntValue]);
return YES;
}]]);
}
@end @end