Revert "Add file capturer to AppRTCMobile on simulator."
This reverts commit 5adcd198752b651f7b7e9199a91f9b873b7d7237. Reason for revert: <INSERT REASONING HERE> Original change's description: > Add file capturer to AppRTCMobile on simulator. > > To achieve this, the CL does the following > - Adds sample mp4 video > - Refactors the existing RTCFileVideoCapturer to achieve continious > capture and adds tests. > > Bug: webrtc:8406 > Change-Id: Ibc0891176c58ec9053b42e340d2113036e7199ec > Reviewed-on: https://webrtc-review.googlesource.com/12180 > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Commit-Queue: Daniela Jovanoska Petrenko <denicija@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20598} TBR=magjed@webrtc.org,andersc@webrtc.org,denicija@webrtc.org Change-Id: I73b35c67296c964f65d206454ac1329b4b979628 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8406 Reviewed-on: https://webrtc-review.googlesource.com/21240 Reviewed-by: Daniela Jovanoska Petrenko <denicija@webrtc.org> Commit-Queue: Daniela Jovanoska Petrenko <denicija@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20599}
This commit is contained in:
committed by
Commit Bot
parent
5adcd19875
commit
b93baffb0a
@ -1,111 +0,0 @@
|
||||
/*
|
||||
* Copyright 2017 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#import "WebRTC/RTCFileVideoCapturer.h"
|
||||
|
||||
#import <XCTest/XCTest.h>
|
||||
|
||||
#include "rtc_base/gunit.h"
|
||||
|
||||
NSString *const kTestFileName = @"foreman.mp4";
|
||||
static const int kTestTimeoutMs = 5 * 1000; // 5secs.
|
||||
|
||||
@interface MockCapturerDelegate : NSObject <RTCVideoCapturerDelegate>
|
||||
|
||||
@property(nonatomic, assign) NSInteger capturedFramesCount;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MockCapturerDelegate
|
||||
@synthesize capturedFramesCount = _capturedFramesCount;
|
||||
|
||||
- (void)capturer:(RTCVideoCapturer *)capturer didCaptureVideoFrame:(RTCVideoFrame *)frame {
|
||||
self.capturedFramesCount++;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_CLASS_AVAILABLE_IOS(10)
|
||||
@interface RTCFileVideoCapturerTests : XCTestCase
|
||||
|
||||
@property(nonatomic, strong) RTCFileVideoCapturer *capturer;
|
||||
@property(nonatomic, strong) MockCapturerDelegate *mockDelegate;
|
||||
|
||||
@end
|
||||
|
||||
@implementation RTCFileVideoCapturerTests
|
||||
@synthesize capturer = _capturer;
|
||||
@synthesize mockDelegate = _mockDelegate;
|
||||
|
||||
- (void)setUp {
|
||||
self.mockDelegate = [[MockCapturerDelegate alloc] init];
|
||||
self.capturer = [[RTCFileVideoCapturer alloc] initWithDelegate:self.mockDelegate];
|
||||
}
|
||||
|
||||
- (void)tearDown {
|
||||
self.capturer = nil;
|
||||
self.mockDelegate = nil;
|
||||
}
|
||||
|
||||
- (void)testCaptureWhenFileNotInBundle {
|
||||
__block BOOL errorOccured = NO;
|
||||
|
||||
RTCFileVideoCapturerErrorBlock errorBlock = ^void(NSError *error) {
|
||||
errorOccured = YES;
|
||||
};
|
||||
|
||||
[self.capturer startCapturingFromFileNamed:@"not_in_bundle.mov" onError:errorBlock];
|
||||
ASSERT_TRUE_WAIT(errorOccured, kTestTimeoutMs);
|
||||
}
|
||||
|
||||
- (void)testSecondStartCaptureCallFails {
|
||||
__block BOOL secondError = NO;
|
||||
|
||||
RTCFileVideoCapturerErrorBlock firstErrorBlock = ^void(NSError *error) {
|
||||
// This block should never be called.
|
||||
NSLog(@"Error: %@", [error userInfo]);
|
||||
ASSERT_TRUE(false);
|
||||
};
|
||||
|
||||
RTCFileVideoCapturerErrorBlock secondErrorBlock = ^void(NSError *error) {
|
||||
secondError = YES;
|
||||
};
|
||||
|
||||
[self.capturer startCapturingFromFileNamed:kTestFileName onError:firstErrorBlock];
|
||||
[self.capturer startCapturingFromFileNamed:kTestFileName onError:secondErrorBlock];
|
||||
|
||||
ASSERT_TRUE_WAIT(secondError, kTestTimeoutMs);
|
||||
}
|
||||
|
||||
- (void)testStartStopCapturer {
|
||||
if (@available(iOS 10, *)) {
|
||||
[self.capturer startCapturingFromFileNamed:kTestFileName onError:nil];
|
||||
|
||||
__block BOOL done = NO;
|
||||
__block NSInteger capturedFrames = -1;
|
||||
NSInteger capturedFramesAfterStop = -1;
|
||||
|
||||
// We're dispatching the `stopCapture` with delay to ensure the capturer has
|
||||
// had the chance to capture several frames.
|
||||
dispatch_time_t captureDelay = dispatch_time(DISPATCH_TIME_NOW, 2 * NSEC_PER_SEC); // 2secs.
|
||||
dispatch_after(captureDelay, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
||||
capturedFrames = self.mockDelegate.capturedFramesCount;
|
||||
[self.capturer stopCapture];
|
||||
done = YES;
|
||||
});
|
||||
WAIT(done, kTestTimeoutMs);
|
||||
|
||||
capturedFramesAfterStop = self.mockDelegate.capturedFramesCount;
|
||||
ASSERT_TRUE(capturedFrames != -1);
|
||||
ASSERT_EQ(capturedFrames, capturedFramesAfterStop);
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
Binary file not shown.
Reference in New Issue
Block a user