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

Revert "Reland "Add completion callbacks to RTCCameraVideoCapturer start/stop operations""

Browse Source 
This reverts commit 24e7a593d576d6eea8512f42f08d6c9c7003e76e.

Reason for revert: Speculative revert, to see if it causes obscure down-stream issues.

Original change's description:
> Reland "Add completion callbacks to RTCCameraVideoCapturer start/stop operations"
> 
> This is a reland of e23a9e8f418ad758bc1be5b53184b69ad1dab1c2
> Original change's description:
> > Add completion callbacks to RTCCameraVideoCapturer start/stop operations
> > 
> > Bug: webrtc:8696
> > Change-Id: I327ce11632fd0c71e28411d260094e87ede6b6b6
> > Reviewed-on: https://webrtc-review.googlesource.com/37021
> > Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> > Reviewed-by: Anders Carlsson <andersc@webrtc.org>
> > Commit-Queue: Anders Carlsson <andersc@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#21546}
> 
> Bug: webrtc:8696
> Change-Id: I48b4d140d870c9924ef0d76f4d282ff13951e083
> Reviewed-on: https://webrtc-review.googlesource.com/38800
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Commit-Queue: Anders Carlsson <andersc@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#21592}

TBR=magjed@webrtc.org,andersc@webrtc.org,kthelgason@webrtc.org,gustavo@lifeonair.com

Change-Id: I11731b1ed7142175fc5b483f313f627556635ede
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8696
Reviewed-on: https://webrtc-review.googlesource.com/39280
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21597}
This commit is contained in:
Erik Språng 2018-01-12 11:53:55 +00:00 committed by Commit Bot
parent 02f0396aa1
commit 0a52f1def6
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sdk/objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m
View File

@ -116,17 +116,6 @@ const int64_t kNanosecondsPerSecond = 1000000000;
- (void)startCaptureWithDevice:(AVCaptureDevice *)device
format:(AVCaptureDeviceFormat *)format
fps:(NSInteger)fps {
[self startCaptureWithDevice:device format:format fps:fps completionHandler:nil];
}
- (void)stopCapture {
[self stopCaptureWithCompletionHandler:nil];
}
- (void)startCaptureWithDevice:(AVCaptureDevice *)device
format:(AVCaptureDeviceFormat *)format
fps:(NSInteger)fps
completionHandler:(nullable void (^)(NSError *))completionHandler {
_willBeRunning = YES;
[RTCDispatcher
dispatchAsyncOnType:RTCDispatcherTypeCaptureSession
@ -143,9 +132,6 @@ const int64_t kNanosecondsPerSecond = 1000000000;
if (![_currentDevice lockForConfiguration:&error]) {
RTCLogError(
@"Failed to lock device %@. Error: %@", _currentDevice, error.userInfo);
if (completionHandler) {
completionHandler(error);
}
return;
}
[self reconfigureCaptureSessionInput];
@ -155,13 +141,10 @@ const int64_t kNanosecondsPerSecond = 1000000000;
[_captureSession startRunning];
[_currentDevice unlockForConfiguration];
_isRunning = YES;
if (completionHandler) {
completionHandler(nil);
}
}];
}
- (void)stopCaptureWithCompletionHandler:(nullable void (^)())completionHandler {
- (void)stopCapture {
_willBeRunning = NO;
[RTCDispatcher
dispatchAsyncOnType:RTCDispatcherTypeCaptureSession
@ -177,9 +160,6 @@ const int64_t kNanosecondsPerSecond = 1000000000;
[[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
#endif
_isRunning = NO;
if (completionHandler) {
completionHandler();
}
}];
}

10
sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h
View File

@ -32,18 +32,10 @@ RTC_EXPORT
// Returns the most efficient supported output pixel format for this capturer.
- (FourCharCode)preferredOutputPixelFormat;
// Starts the capture session asynchronously and notifies callback on completion.
// Starts and stops the capture session asynchronously.
// The device will capture video in the format given in the `format` parameter. If the pixel format
// in `format` is supported by the WebRTC pipeline, the same pixel format will be used for the
// output. Otherwise, the format returned by `preferredOutputPixelFormat` will be used.
- (void)startCaptureWithDevice:(AVCaptureDevice *)device
format:(AVCaptureDeviceFormat *)format
fps:(NSInteger)fps
completionHandler:(nullable void (^)(NSError *))completionHandler;
// Stops the capture session asynchronously and notifies callback on completion.
- (void)stopCaptureWithCompletionHandler:(nullable void (^)())completionHandler;
// Starts the capture session asynchronously.
- (void)startCaptureWithDevice:(AVCaptureDevice *)device
format:(AVCaptureDeviceFormat *)format
fps:(NSInteger)fps;