9932e255ea
This CL makes sure the real VideoTrackSourceInterface implementation is destroyed on the signaling thread and marshals all method calls to the signaling thread. This is done using VideoTrackSourceProxy. Bug: webrtc:7767 Change-Id: Iba3b67bb32a684ba289bc8b9981585ea58084359 Reviewed-on: https://chromium-review.googlesource.com/526634 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18476}
68 lines
2.4 KiB
Plaintext
68 lines
2.4 KiB
Plaintext
/*
|
|
* Copyright 2015 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 "RTCVideoSource+Private.h"
|
|
|
|
#include "webrtc/api/videosourceproxy.h"
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h"
|
|
|
|
static webrtc::ObjcVideoTrackSource *getObjcVideoSource(
|
|
const rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> nativeSource) {
|
|
webrtc::VideoTrackSourceProxy *proxy_source =
|
|
static_cast<webrtc::VideoTrackSourceProxy *>(nativeSource.get());
|
|
return static_cast<webrtc::ObjcVideoTrackSource *>(proxy_source->internal());
|
|
}
|
|
|
|
// TODO(magjed): Refactor this class and target ObjcVideoTrackSource only once
|
|
// RTCAVFoundationVideoSource is gone. See http://crbug/webrtc/7177 for more
|
|
// info.
|
|
@implementation RTCVideoSource {
|
|
rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> _nativeVideoSource;
|
|
}
|
|
|
|
- (instancetype)initWithNativeVideoSource:
|
|
(rtc::scoped_refptr<webrtc::VideoTrackSourceInterface>)nativeVideoSource {
|
|
RTC_DCHECK(nativeVideoSource);
|
|
if (self = [super initWithNativeMediaSource:nativeVideoSource
|
|
type:RTCMediaSourceTypeVideo]) {
|
|
_nativeVideoSource = nativeVideoSource;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (instancetype)initWithNativeMediaSource:
|
|
(rtc::scoped_refptr<webrtc::MediaSourceInterface>)nativeMediaSource
|
|
type:(RTCMediaSourceType)type {
|
|
RTC_NOTREACHED();
|
|
return nil;
|
|
}
|
|
|
|
- (NSString *)description {
|
|
NSString *stateString = [[self class] stringForState:self.state];
|
|
return [NSString stringWithFormat:@"RTCVideoSource( %p ): %@", self, stateString];
|
|
}
|
|
|
|
- (void)capturer:(RTCVideoCapturer *)capturer didCaptureVideoFrame:(RTCVideoFrame *)frame {
|
|
getObjcVideoSource(_nativeVideoSource)->OnCapturedFrame(frame);
|
|
}
|
|
|
|
- (void)adaptOutputFormatToWidth:(int)width height:(int)height fps:(int)fps {
|
|
getObjcVideoSource(_nativeVideoSource)->OnOutputFormatRequest(width, height, fps);
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (rtc::scoped_refptr<webrtc::VideoTrackSourceInterface>)nativeVideoSource {
|
|
return _nativeVideoSource;
|
|
}
|
|
|
|
@end
|