nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1817724 - [libwebrtc] Restore changes to RTCCameraVideoCapturer.m. r=webrtc-reviewers,ng

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D171961
This commit is contained in:
Andreas Pehrson 2023-03-30 10:36:33 +00:00
parent a4c00309de
commit dd4f9a828f
1 changed files with 1 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
third_party/libwebrtc/sdk/objc/components/capturer/RTCCameraVideoCapturer.m vendored
View file

@ -186,7 +186,6 @@ const int64_t kNanosecondsPerSecond = 1000000000;
[self updateOrientation]; [self updateOrientation];
[self updateDeviceCaptureFormat:format fps:fps]; [self updateDeviceCaptureFormat:format fps:fps];
[self updateVideoDataOutputPixelFormat:format]; [self updateVideoDataOutputPixelFormat:format];
[_videoDataOutput setSampleBufferDelegate:self queue:self.frameQueue];
[self.captureSession startRunning]; [self.captureSession startRunning];
[self.currentDevice unlockForConfiguration]; [self.currentDevice unlockForConfiguration];
self.isRunning = YES; self.isRunning = YES;
@ -206,7 +205,6 @@ const int64_t kNanosecondsPerSecond = 1000000000;
for (AVCaptureDeviceInput *oldInput in [self.captureSession.inputs copy]) { for (AVCaptureDeviceInput *oldInput in [self.captureSession.inputs copy]) {
[self.captureSession removeInput:oldInput]; [self.captureSession removeInput:oldInput];
} }
[_videoDataOutput setSampleBufferDelegate:nil queue:nil];
[self.captureSession stopRunning]; [self.captureSession stopRunning];
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
@ -217,11 +215,6 @@ const int64_t kNanosecondsPerSecond = 1000000000;
} }
}); });
#endif #endif
// Wait for any pending captureOutput tasks.
dispatch_sync(self.frameQueue, ^{
});
self.isRunning = NO; self.isRunning = NO;
if (completionHandler) { if (completionHandler) {
completionHandler(); completionHandler();
@ -471,6 +464,7 @@ const int64_t kNanosecondsPerSecond = 1000000000;
_outputPixelFormat = _preferredOutputPixelFormat; _outputPixelFormat = _preferredOutputPixelFormat;
videoDataOutput.videoSettings = @{(NSString *)kCVPixelBufferPixelFormatTypeKey : pixelFormat}; videoDataOutput.videoSettings = @{(NSString *)kCVPixelBufferPixelFormatTypeKey : pixelFormat};
videoDataOutput.alwaysDiscardsLateVideoFrames = NO; videoDataOutput.alwaysDiscardsLateVideoFrames = NO;
[videoDataOutput setSampleBufferDelegate:self queue:self.frameQueue];
_videoDataOutput = videoDataOutput; _videoDataOutput = videoDataOutput;
} }