Index: webrtc/sdk/BUILD.gn |
diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn |
index e691a8e5bb41a1ad4780a40f18e3992a67a8b19a..7c72021aae95d2cd87c1bc0216a2aa3585bf2032 100644 |
--- a/webrtc/sdk/BUILD.gn |
+++ b/webrtc/sdk/BUILD.gn |
@@ -310,6 +310,7 @@ if (is_ios || is_mac) { |
sources = [ |
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h", |
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm", |
+ "objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm", |
] |
public_configs = [ ":objc_common_config" ] |
@@ -326,11 +327,15 @@ if (is_ios || is_mac) { |
":objc_peerconnectionfactory_base", |
":objc_video", |
":objc_videotoolbox", |
+ ":objc_videotracksource", |
"../api:video_frame_api", |
+ "../api/video_codecs:video_codecs_api", |
+ "../media:rtc_audio_video", |
"../media:rtc_media_base", |
"../pc:create_pc_factory", |
"../pc:peerconnection", |
"../rtc_base:rtc_base", |
+ "../system_wrappers:field_trial_api", |
] |
} |
@@ -377,6 +382,7 @@ if (is_ios || is_mac) { |
"objc/Framework/Classes/PeerConnection/RTCDataChannel.mm", |
"objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h", |
"objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration.mm", |
+ "objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm", |
"objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h", |
"objc/Framework/Classes/PeerConnection/RTCIceCandidate.mm", |
"objc/Framework/Classes/PeerConnection/RTCIceServer+Private.h", |
@@ -404,6 +410,7 @@ if (is_ios || is_mac) { |
"objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm", |
"objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters+Private.h", |
"objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters.mm", |
+ "objc/Framework/Classes/PeerConnection/RTCRtpFragmentationHeader.mm", |
"objc/Framework/Classes/PeerConnection/RTCRtpParameters+Private.h", |
"objc/Framework/Classes/PeerConnection/RTCRtpParameters.mm", |
"objc/Framework/Classes/PeerConnection/RTCRtpReceiver+Private.h", |
@@ -415,6 +422,9 @@ if (is_ios || is_mac) { |
"objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm", |
"objc/Framework/Classes/PeerConnection/RTCTracing.mm", |
"objc/Framework/Classes/PeerConnection/RTCVideoCapturer.m", |
+ "objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h", |
+ "objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm", |
+ "objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm", |
"objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm", |
"objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter+Private.h", |
"objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.h", |
@@ -475,6 +485,7 @@ if (is_ios || is_mac) { |
"../api:video_frame_api", |
"../common_video", |
"../media:rtc_media_base", |
+ "../modules:module_api", |
"../pc:peerconnection", |
"../rtc_base:rtc_base", |
] |
@@ -501,6 +512,8 @@ if (is_ios || is_mac) { |
"objc/Framework/UnitTests/RTCSessionDescriptionTest.mm", |
"objc/Framework/UnitTests/RTCTracingTest.mm", |
"objc/Framework/UnitTests/avformatmappertests.mm", |
+ "objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm", |
+ "objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm", |
] |
if (is_ios && |
!(use_ios_simulator && |
@@ -518,7 +531,11 @@ if (is_ios || is_mac) { |
defines = [ "GTEST_RELATIVE_PATH" ] |
deps = [ |
":objc_peerconnection", |
+ ":objc_peerconnectionfactory", |
+ ":objc_videotoolbox", |
+ ":objc_videotracksource", |
"..//system_wrappers:system_wrappers_default", |
+ "../modules:module_api", |
"../rtc_base:rtc_base_tests_utils", |
"../system_wrappers:system_wrappers_default", |
"//third_party/ocmock", |
@@ -553,6 +570,8 @@ if (is_ios || is_mac) { |
common_objc_headers = [ |
"objc/Framework/Headers/WebRTC/RTCAudioSession.h", |
+ "objc/Framework/Headers/WebRTC/RTCVideoCodec.h", |
+ "objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h", |
"objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h", |
"objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h", |
"objc/Framework/Headers/WebRTC/RTCAudioSource.h", |
@@ -595,6 +614,7 @@ if (is_ios || is_mac) { |
"objc/Framework/Headers/WebRTC/RTCVideoTrack.h", |
"objc/Framework/Headers/WebRTC/RTCVideoViewShading.h", |
"objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h", |
+ "objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h", |
"objc/Framework/Headers/WebRTC/WebRTC.h", |
] |
if (rtc_use_metal_rendering) { |
@@ -681,8 +701,10 @@ if (is_ios || is_mac) { |
"objc/Framework/Classes/VideoToolbox/encoder.mm", |
"objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc", |
"objc/Framework/Classes/VideoToolbox/nalu_rewriter.h", |
- "objc/Framework/Classes/VideoToolbox/videocodecfactory.h", |
- "objc/Framework/Classes/VideoToolbox/videocodecfactory.mm", |
+ "objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h", |
+ "objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm", |
+ "objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h", |
+ "objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm", |
"objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h", |
] |
@@ -692,6 +714,7 @@ if (is_ios || is_mac) { |
":objc_common", |
":objc_video", |
":objc_videotracksource", |
+ "../api/video_codecs:video_codecs_api", |
"../common_video", |
"../media:rtc_media", |
"../media:rtc_media_base", |