7341ab8e25
Reason for revert: Breaks chrome, see https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/19019/steps/compile/logs/stdio Analysis: Chrome uses cricket::VideoFrame, without explicitly including webrtc/media/base/videoframe.h, and breaks when that file is no longer included by any other webrtc headers. Will reland after updating Chrome. Original issue's description: > Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. > > Replaced with webrtc::VideoFrame. > > TBR=mflodman@webrtc.org > BUG=webrtc:5682 > > Committed: https://crrev.com/45c8b8940042bd2574c39920804ade8343cefdba > Cr-Commit-Position: refs/heads/master@{#14885} TBR=perkj@webrtc.org,pthatcher@webrtc.org,tkchin@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2471783002 Cr-Commit-Position: refs/heads/master@{#14886}
43 lines
1.4 KiB
Objective-C
43 lines
1.4 KiB
Objective-C
/*
|
|
* 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 "RTCVideoRendererAdapter.h"
|
|
|
|
#import "WebRTC/RTCVideoRenderer.h"
|
|
|
|
#include "webrtc/api/mediastreaminterface.h"
|
|
|
|
NS_ASSUME_NONNULL_BEGIN
|
|
|
|
@interface RTCVideoRendererAdapter ()
|
|
|
|
/**
|
|
* The Objective-C video renderer passed to this adapter during construction.
|
|
* Calls made to the webrtc::VideoRenderInterface will be adapted and passed to
|
|
* this video renderer.
|
|
*/
|
|
@property(nonatomic, readonly) id<RTCVideoRenderer> videoRenderer;
|
|
|
|
/**
|
|
* The native VideoSinkInterface surface exposed by this adapter. Calls made
|
|
* to this interface will be adapted and passed to the RTCVideoRenderer supplied
|
|
* during construction. This pointer is unsafe and owned by this class.
|
|
*/
|
|
@property(nonatomic, readonly)
|
|
rtc::VideoSinkInterface<cricket::VideoFrame> *nativeVideoRenderer;
|
|
|
|
/** Initialize an RTCVideoRendererAdapter with an RTCVideoRenderer. */
|
|
- (instancetype)initWithNativeRenderer:(id<RTCVideoRenderer>)videoRenderer
|
|
NS_DESIGNATED_INITIALIZER;
|
|
|
|
@end
|
|
|
|
NS_ASSUME_NONNULL_END
|