Built against commit 5a3ebd761cb2789aa63e4ae7c0035234a3e3b5f3 (plus f…

…ixes for ARM64 and video orientation).
kapejod · May 26, 2015 · a423971 · a423971
1 parent f2c2e9c
commit a423971
Show file tree

Hide file tree

Showing 106 changed files with 85 additions and 28 deletions.
diff --git a/WebRTC.podspec b/WebRTC.podspec
@@ -25,8 +25,8 @@ Pod::Spec.new do |s|
 
   s.source_files  = "include/*.h"
   s.public_header_files = "include/*.h"
-  s.preserve_path = "lib/libCNG.a", "lib/libG711.a", "lib/libG722.a", "lib/libPCM16B.a", "lib/lib_core_neon_offsets.a", "lib/libaudio_coding_module.a", "lib/libaudio_conference_mixer.a", "lib/libaudio_device.a", "lib/libaudio_decoder_interface.a", "lib/libaudio_processing.a", "lib/libaudio_processing_neon.a", "lib/libaudio_processing_sse2.a", "lib/libbitrate_controller.a", "lib/libcommon_audio.a", "lib/libcommon_audio_neon.a", "lib/libcommon_audio_sse2.a", "lib/libcommon_video.a", "lib/libcrnspr.a", "lib/libcrnss.a", "lib/libcrnssckbi.a", "lib/libcrssl.a", "lib/libexpat.a", "lib/libfield_trial_default.a", "lib/libiLBC.a", "lib/libiSAC.a", "lib/libiSACFix.a", "lib/libicudata.a", "lib/libicui18n.a", "lib/libicuuc.a", "lib/libisac_neon.a", "lib/libjingle_media.a", "lib/libjingle_p2p.a", "lib/libjingle_peerconnection.a", "lib/libjingle_peerconnection_objc.a", "lib/libjsoncpp.a", "lib/libmedia_file.a", "lib/libmetrics_default.a", "lib/libneteq.a", "lib/libnss_static.a", "lib/libopus.a", "lib/libpaced_sender.a", "lib/librbe_components.a", "lib/libremote_bitrate_estimator.a", "lib/librtc_base.a", "lib/librtc_base_approved.a", "lib/librtc_p2p.a", "lib/librtc_sound.a", "lib/librtc_xmllite.a", "lib/librtc_xmpp.a", "lib/librtp_rtcp.a", "lib/libsqlite_regexp.a", "lib/libsrtp.a", "lib/libsystem_wrappers.a", "lib/libusrsctplib.a", "lib/libvideo_capture_module.a", "lib/libvideo_capture_module_internal_impl.a", "lib/libvideo_coding_utility.a", "lib/libvideo_engine_core.a", "lib/libvideo_processing.a", "lib/libvideo_processing_sse2.a", "lib/libvideo_render_module.a", "lib/libvideo_render_module_internal_impl.a", "lib/libvoice_engine.a", "lib/libvpx.a", "lib/libvpx_asm_offsets_vp8.a", "lib/libvpx_asm_offsets_vpx_scale.a", "lib/libvpx_intrinsics_mmx.a", "lib/libvpx_intrinsics_sse2.a", "lib/libvpx_intrinsics_sse4_1.a", "lib/libvpx_intrinsics_ssse3.a", "lib/libwebrtc.a", "lib/libwebrtc_common.a", "lib/libwebrtc_i420.a", "lib/libwebrtc_opus.a", "lib/libwebrtc_utility.a", "lib/libwebrtc_video_coding.a", "lib/libwebrtc_vp8.a", "lib/libwebrtc_vp9.a", "lib/libyuv.a", "lib/libyuv_neon.a"
-  s.vendored_libraries = "lib/libCNG.a", "lib/libG711.a", "lib/libG722.a", "lib/libPCM16B.a", "lib/lib_core_neon_offsets.a", "lib/libaudio_coding_module.a", "lib/libaudio_conference_mixer.a", "lib/libaudio_device.a", "lib/libaudio_decoder_interface.a",  "lib/libaudio_processing.a", "lib/libaudio_processing_neon.a", "lib/libaudio_processing_sse2.a", "lib/libbitrate_controller.a", "lib/libcommon_audio.a", "lib/libcommon_audio_neon.a", "lib/libcommon_audio_sse2.a", "lib/libcommon_video.a", "lib/libcrnspr.a", "lib/libcrnss.a", "lib/libcrnssckbi.a", "lib/libcrssl.a", "lib/libexpat.a", "lib/libfield_trial_default.a", "lib/libiLBC.a", "lib/libiSAC.a", "lib/libiSACFix.a", "lib/libicudata.a", "lib/libicui18n.a", "lib/libicuuc.a", "lib/libisac_neon.a", "lib/libjingle_media.a", "lib/libjingle_p2p.a", "lib/libjingle_peerconnection.a", "lib/libjingle_peerconnection_objc.a", "lib/libjsoncpp.a", "lib/libmedia_file.a", "lib/libmetrics_default.a", "lib/libneteq.a", "lib/libnss_static.a", "lib/libopus.a", "lib/libpaced_sender.a", "lib/librbe_components.a", "lib/libremote_bitrate_estimator.a", "lib/librtc_base.a", "lib/librtc_base_approved.a", "lib/librtc_p2p.a", "lib/librtc_sound.a", "lib/librtc_xmllite.a", "lib/librtc_xmpp.a", "lib/librtp_rtcp.a", "lib/libsqlite_regexp.a", "lib/libsrtp.a", "lib/libsystem_wrappers.a", "lib/libusrsctplib.a", "lib/libvideo_capture_module.a", "lib/libvideo_capture_module_internal_impl.a", "lib/libvideo_coding_utility.a", "lib/libvideo_engine_core.a", "lib/libvideo_processing.a", "lib/libvideo_processing_sse2.a", "lib/libvideo_render_module.a", "lib/libvideo_render_module_internal_impl.a", "lib/libvoice_engine.a", "lib/libvpx.a", "lib/libvpx_asm_offsets_vp8.a", "lib/libvpx_asm_offsets_vpx_scale.a", "lib/libvpx_intrinsics_mmx.a", "lib/libvpx_intrinsics_sse2.a", "lib/libvpx_intrinsics_sse4_1.a", "lib/libvpx_intrinsics_ssse3.a", "lib/libwebrtc.a", "lib/libwebrtc_common.a", "lib/libwebrtc_i420.a", "lib/libwebrtc_opus.a", "lib/libwebrtc_utility.a", "lib/libwebrtc_video_coding.a", "lib/libwebrtc_vp8.a", "lib/libwebrtc_vp9.a", "lib/libyuv.a", "lib/libyuv_neon.a"
+  s.preserve_path = "lib/libWebRTC.a"
+  s.vendored_libraries = "lib/libWebRTC.a"
 
   s.frameworks = "QuartzCore", "OpenGLES", "AudioToolbox", "AVFoundation", "CoreVideo", "Foundation", "UIKit", "CoreGraphics", "Security", "AssetsLibrary", "MobileCoreServices", "CoreLocation", "CoreMedia", "GLKit"
   s.libraries = "sqlite3", "stdc++", "System", "util"

diff --git a/include/RTCAVFoundationVideoSource.h b/include/RTCAVFoundationVideoSource.h
@@ -0,0 +1,49 @@
+/*
+ * libjingle
+ * Copyright 2015 Google Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright notice,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ *  3. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "RTCVideoSource.h"
+
+@class AVCaptureSession;
+@class RTCMediaConstraints;
+@class RTCPeerConnectionFactory;
+
+// RTCAVFoundationVideoSource is a video source that uses
+// webrtc::AVFoundationVideoCapturer. We do not currently provide a wrapper for
+// that capturer because cricket::VideoCapturer is not ref counted and we cannot
+// guarantee its lifetime. Instead, we expose its properties through the ref
+// counted video source interface.
+@interface RTCAVFoundationVideoSource : RTCVideoSource
+
+- (instancetype)initWithFactory:(RTCPeerConnectionFactory*)factory
+                    constraints:(RTCMediaConstraints*)constraints;
+
+// Switches the camera being used (either front or back).
+@property(nonatomic, assign) BOOL useBackCamera;
+// Returns the active capture session.
+@property(nonatomic, readonly) AVCaptureSession* captureSession;
+
+@end
diff --git a/include/RTCAudioSource.h b/include/RTCAudioSource.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCAudioTrack.h b/include/RTCAudioTrack.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCDataChannel.h b/include/RTCDataChannel.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCEAGLVideoView.h b/include/RTCEAGLVideoView.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCI420Frame.h b/include/RTCI420Frame.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCICECandidate.h b/include/RTCICECandidate.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCICEServer.h b/include/RTCICEServer.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCMediaConstraints.h b/include/RTCMediaConstraints.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCMediaSource.h b/include/RTCMediaSource.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCMediaStream.h b/include/RTCMediaStream.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCMediaStreamTrack.h b/include/RTCMediaStreamTrack.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCNSGLVideoView.h b/include/RTCNSGLVideoView.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCOpenGLVideoRenderer.h b/include/RTCOpenGLVideoRenderer.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCPair.h b/include/RTCPair.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCPeerConnection.h b/include/RTCPeerConnection.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCPeerConnectionDelegate.h b/include/RTCPeerConnectionDelegate.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCPeerConnectionFactory.h b/include/RTCPeerConnectionFactory.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCSessionDescription.h b/include/RTCSessionDescription.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCSessionDescriptionDelegate.h b/include/RTCSessionDescriptionDelegate.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCStatsDelegate.h b/include/RTCStatsDelegate.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCStatsReport.h b/include/RTCStatsReport.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCTypes.h b/include/RTCTypes.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCVideoCapturer.h b/include/RTCVideoCapturer.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCVideoRenderer.h b/include/RTCVideoRenderer.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCVideoSource.h b/include/RTCVideoSource.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/include/RTCVideoTrack.h b/include/RTCVideoTrack.h
@@ -1,6 +1,6 @@
 /*
  * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -28,10 +28,18 @@
 #import "RTCMediaStreamTrack.h"
 
 @protocol RTCVideoRenderer;
+@class RTCPeerConnectionFactory;
+@class RTCVideoSource;
 
 // RTCVideoTrack is an ObjectiveC wrapper for VideoTrackInterface.
 @interface RTCVideoTrack : RTCMediaStreamTrack
 
+@property(nonatomic, readonly) RTCVideoSource* source;
+
+- (instancetype)initWithFactory:(RTCPeerConnectionFactory*)factory
+                         source:(RTCVideoSource*)source
+                        trackId:(NSString*)trackId;
+
 // Register a renderer that will render all frames received on this track.
 - (void)addRenderer:(id<RTCVideoRenderer>)renderer;