commit 96de428fd1f301c3ad1355183b45e44db5ef3f7f
author Jeremy Newton-Smith <jeremyns@webrtc.org> Wed Aug 23 10:02:23 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Aug 23 22:46:44 2017 +0000
tree 4cf68826fd764c12d513f4209d889067f26e96bc
parent 82fac89381b6981f3f9d83ce38100330c700433d

Adding injectable audio decoder and encoder factory support to the RTCPeerConnection obj-c layer.

Bug: webrtc:8093
Change-Id: I868ce5f75a72c6deb065dec60784289d045ae22a
Reviewed-on: https://chromium-review.googlesource.com/608981
Commit-Queue: Jeremy Newton-Smith <jeremyns@webrtc.org>
Reviewed-by: Zeke Chin <tkchin@webrtc.org>
Reviewed-by: Kári Tristan Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19477}

webrtc/sdk/BUILD.gn

diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
index 3809aa1..33797ce 100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -310,9 +310,15 @@
 
     rtc_static_library("objc_peerconnectionfactory") {
       sources = [
+        "objc/Framework/Classes/PeerConnection/RTCBuiltinAudioDecoderFactory.mm",
+        "objc/Framework/Classes/PeerConnection/RTCBuiltinAudioEncoderFactory.mm",
         "objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h",
         "objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm",
         "objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm",
+        "objc/Framework/Headers/WebRTC/RTCAudioDecoderFactory.h",
+        "objc/Framework/Headers/WebRTC/RTCAudioEncoderFactory.h",
+        "objc/Framework/Headers/WebRTC/RTCBuiltinAudioDecoderFactory.h",
+        "objc/Framework/Headers/WebRTC/RTCBuiltinAudioEncoderFactory.h",
       ]
 
       public_configs = [ ":objc_common_config" ]
@@ -331,6 +337,8 @@
         ":objc_videotoolbox",
         ":objc_videotracksource",
         "../api:video_frame_api",
+        "../api/audio_codecs:builtin_audio_decoder_factory",
+        "../api/audio_codecs:builtin_audio_encoder_factory",
         "../api/video_codecs:video_codecs_api",
         "../media:rtc_audio_video",
         "../media:rtc_media_base",
@@ -569,15 +577,16 @@
       ios_framework_bundle("objc_framework") {
         info_plist = "objc/Framework/Info.plist"
         output_name = "WebRTC"
-
         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/RTCAudioDecoderFactory.h",
+          "objc/Framework/Headers/WebRTC/RTCAudioEncoderFactory.h",
+          "objc/Framework/Headers/WebRTC/RTCAudioSession.h",
+          "objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h",
           "objc/Framework/Headers/WebRTC/RTCAudioSource.h",
           "objc/Framework/Headers/WebRTC/RTCAudioTrack.h",
+          "objc/Framework/Headers/WebRTC/RTCBuiltinAudioDecoderFactory.h",
+          "objc/Framework/Headers/WebRTC/RTCBuiltinAudioEncoderFactory.h",
           "objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h",
           "objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h",
           "objc/Framework/Headers/WebRTC/RTCConfiguration.h",
@@ -609,6 +618,8 @@
           "objc/Framework/Headers/WebRTC/RTCSessionDescription.h",
           "objc/Framework/Headers/WebRTC/RTCTracing.h",
           "objc/Framework/Headers/WebRTC/RTCVideoCapturer.h",
+          "objc/Framework/Headers/WebRTC/RTCVideoCodec.h",
+          "objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h",
           "objc/Framework/Headers/WebRTC/RTCVideoFrame.h",
           "objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h",
           "objc/Framework/Headers/WebRTC/RTCVideoRenderer.h",