commit 3ff50fba59cb260067a4e1186b61a4792d4e8bb2
author Anders Carlsson <andersc@webrtc.org> Thu Feb 01 15:47:05 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Thu Feb 01 16:36:24 2018 +0000
tree 5b7ee19867ff51f013a3623be47b7c1180f430f2
parent bc3b7828139c41923a38e21c61ed1e29733e9e7f

Create experimental Obj-C++ API.

This can be used to wrap Objective-C components in C++ classes, so users
can use the WebRTC C++ API directly together with the iOS specific
components provided by our SDK.

Bug: webrtc:8832
Change-Id: I6d34f7ec62d51df8d3a5340a2e17d30ae73e13e8
Reviewed-on: https://webrtc-review.googlesource.com/46162
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21850}

modules/video_coding/BUILD.gn

diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index fe5414f..aca5903 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -462,6 +462,7 @@
         "../../modules:module_api",
         "../../rtc_base:rtc_base_approved",
         "../../sdk:common_objc",
+        "../../sdk:native_api",
         "../../sdk:peerconnection_objc",
         "../../sdk:peerconnectionfactory_objc",
         "../../sdk:videotoolbox_objc",

modules/video_coding/codecs/test/objc_codec_h264_test.mm

diff --git a/modules/video_coding/codecs/test/objc_codec_h264_test.mm b/modules/video_coding/codecs/test/objc_codec_h264_test.mm
index 74ba84a..ed3fb4d 100644
--- a/modules/video_coding/codecs/test/objc_codec_h264_test.mm
+++ b/modules/video_coding/codecs/test/objc_codec_h264_test.mm
@@ -11,18 +11,17 @@
 #include "modules/video_coding/codecs/test/objc_codec_h264_test.h"
 
 #import "WebRTC/RTCVideoCodecH264.h"
-#include "rtc_base/ptr_util.h"
-#include "sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h"
-#include "sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h"
+#include "sdk/objc/Framework/Native/api/video_decoder_factory.h"
+#include "sdk/objc/Framework/Native/api/video_encoder_factory.h"
 
 namespace webrtc {
 
 std::unique_ptr<VideoEncoderFactory> CreateObjCEncoderFactory() {
-  return rtc::MakeUnique<ObjCVideoEncoderFactory>([[RTCVideoEncoderFactoryH264 alloc] init]);
+  return ObjCToNativeVideoEncoderFactory([[RTCVideoEncoderFactoryH264 alloc] init]);
 }
 
 std::unique_ptr<VideoDecoderFactory> CreateObjCDecoderFactory() {
-  return rtc::MakeUnique<ObjCVideoDecoderFactory>([[RTCVideoDecoderFactoryH264 alloc] init]);
+  return ObjCToNativeVideoDecoderFactory([[RTCVideoDecoderFactoryH264 alloc] init]);
 }
 
 }  // namespace webrtc